omar 73f9c9d80c Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp		2017-08-11 13:44:25 +08:00
..
build_win32.bat	Examples: Fixed msvc batch files from warning.	2015-12-07 21:27:25 +00:00
directx11_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
directx11_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
imgui_impl_dx11.cpp	Merge remote-tracking branch 'origin' into 2016-07-navigation	2017-08-07 22:51:18 +08:00
imgui_impl_dx11.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