omar f79f0e42f7 Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.h		2020-07-14 18:38:47 +02:00
..
build_win32.bat
example_glfw_opengl3.vcxproj
example_glfw_opengl3.vcxproj.filters
main.cpp	Merge branch 'master' into docking	2020-07-14 18:38:47 +02:00
Makefile