omar 73f9c9d80c Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp		2017-08-11 13:44:25 +08: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 2016-07-navigation	2017-05-01 12:38:33 +02:00
imgui_impl_glfw_gl3.h	FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...)	2016-03-24 11:00:47 +01:00
main.cpp	Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS	2017-08-11 13:36:28 +08:00
Makefile	add SDL GL3 makefile	2017-07-02 21:38:27 -05:00
opengl3_example.vcxproj	Examples: Added README into the Visual Studio solution to people are less likely to miss it.	2015-11-29 11:01:50 +00:00
opengl3_example.vcxproj.filters	Examples: Added README into the Visual Studio solution to people are less likely to miss it.	2015-11-29 11:01:50 +00:00