omar e73217d6f7 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp

2018-10-12 15:50:48 +02:00

..

build_win32.bat

…

example_win32_directx11.vcxproj

…

example_win32_directx11.vcxproj.filters

…

main.cpp

Merge branch 'master' into viewport

2018-10-12 15:50:48 +02:00