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
..
example_apple_opengl2.xcodeproj	OSX: Added imgui_widgets.cpp to xcode project files.	2018-08-31 11:29:25 +02:00
main.mm	Merge branch 'viewport' into docking	2018-09-14 11:38:10 +02:00