omar 9660657e95 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_sdl.cpp

2018-06-10 15:59:35 +02:00

..

build_win32.bat

…

example_glfw_opengl2.vcxproj

…

example_glfw_opengl2.vcxproj.filters

…

main.cpp

Merge branch 'master' into viewport

2018-06-10 15:59:35 +02:00

Makefile

…