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

# Conflicts:
#	examples/imgui_impl_sdl.cpp

2019-04-15 16:03:17 +02:00

..

build_win32.bat

…

example_glfw_opengl2.vcxproj

…

example_glfw_opengl2.vcxproj.filters

…

main.cpp

…

Makefile

…