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

# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp

2019-04-25 17:53:11 +02:00

1.8 KiB

Raw Blame History

View Raw