omar 5c4fda0fbc Merge branch 'master' into navigation ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

2017-09-06 19:17:51 +02:00

..

build_win32.bat

…

directx10_example.vcxproj

…

directx10_example.vcxproj.filters

…

imgui_impl_dx10.cpp

Merge remote-tracking branch 'origin' into 2016-07-navigation

2017-08-07 22:51:18 +08:00

imgui_impl_dx10.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

Examples: Main: Removed call to SetNextWindowSize()

2017-09-01 17:07:19 +02:00