omar 23c11e9764 Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp		2018-01-31 15:43:19 +01:00
..
build_win32.bat	Tweak build batch files and readmes	2015-11-16 22:03:13 +01:00
imgui_impl_glfw_gl3.cpp	Merge branch 'master' into navigation	2018-01-29 17:42:39 +01:00
imgui_impl_glfw_gl3.h	Examples: Comments to guide people unfamiliar with the librairies used.	2017-10-28 19:28:22 +02:00
main.cpp	Merge branch 'master' into navigation	2018-01-31 15:43:19 +01:00
Makefile	Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)	2018-01-29 00:55:16 +01:00
opengl3_example.vcxproj	Added imgui.natvis helper for visual studio users. Added to examples projects.	2018-01-24 18:40:54 +01:00
opengl3_example.vcxproj.filters	Added imgui.natvis helper for visual studio users. Added to examples projects.	2018-01-24 18:40:54 +01:00