omar c398153b40 Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h		2018-10-12 13:01:20 +02:00
..
build_win32.bat	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
example_win32_directx10.vcxproj	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00
example_win32_directx10.vcxproj.filters	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00
main.cpp	Merge branch 'master' into docking	2018-10-12 13:01:20 +02:00