Merge branch 'master' into 2016-02-colorpicker
commit db436b183baf6af8bf6ec2159fe8b119b4942853
2 parents 3926bd0 + 645875a
@omar omar authored on 29 Jul 2017
Showing 10 changed files
View
examples/directx10_example/main.cpp
View
examples/directx11_example/main.cpp
View
examples/directx9_example/main.cpp
View
examples/opengl2_example/imgui_impl_glfw.cpp
View
examples/opengl2_example/main.cpp
View
examples/opengl3_example/main.cpp
View
examples/sdl_opengl2_example/imgui_impl_sdl.cpp
View
examples/sdl_opengl2_example/main.cpp
View
examples/vulkan_example/build_win32.bat
View
examples/vulkan_example/build_win64.bat