omar e32256b4b4 Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui_demo.cpp # imgui_internal.h		2018-09-14 11:38:10 +02:00
..
build_win32.bat	Examples: Fixes.	2018-06-23 09:42:47 +02:00
example_glfw_opengl3.vcxproj	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00
example_glfw_opengl3.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 'viewport' into docking	2018-09-14 11:38:10 +02:00
Makefile	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00