omar f7db4fad31 Merge branch 'master' into docking ...

# Conflicts:
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp

2019-03-11 16:08:16 +01:00

..

build_win32.bat

…

example_win32_directx12.vcxproj

Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).

2019-01-16 15:10:31 +01:00

example_win32_directx12.vcxproj.filters

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 19:00:33 +02:00

main.cpp

Merge branch 'master' into docking

2019-03-11 16:08:16 +01:00