omar 23c11e9764 Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp		2018-01-31 15:43:19 +01:00
..
build_win32.bat	Examples: Fixed msvc batch files from warning.	2015-12-07 21:27:25 +00:00
directx11_example.vcxproj	Added imgui.natvis helper for visual studio users. Added to examples projects.	2018-01-24 18:40:54 +01:00
directx11_example.vcxproj.filters	Added imgui.natvis helper for visual studio users. Added to examples projects.	2018-01-24 18:40:54 +01:00
imgui_impl_dx11.cpp	Merge branch 'master' into navigation	2018-01-29 17:42:39 +01:00
imgui_impl_dx11.h	Fix wrong comment in dx implementation headers	2017-11-18 13:56:59 +01:00
main.cpp	Merge branch 'master' into navigation	2018-01-31 15:43:19 +01:00