ocornut 05bc204dbd Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.h		2020-08-18 17:51:43 +02:00
..
build_win32.bat	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
example_win32_directx10.vcxproj	Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"	2020-08-10 11:33:59 +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	2020-08-18 17:51:43 +02:00