Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
#	imgui.h
commit 172570acae5eb9422bcd82e4f1cd54a0b35b21ba
2 parents c29971c + 75c3793
@omar omar authored on 20 Mar 2018
Showing 21 changed files
View
CHANGELOG.txt
View
examples/directx10_example/main.cpp
View
examples/directx11_example/main.cpp
View
examples/imgui_impl_dx10.cpp
View
examples/imgui_impl_dx11.cpp
View
examples/imgui_impl_dx12.cpp
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_opengl3.cpp
View
examples/imgui_impl_sdl2.cpp
View
examples/imgui_impl_vulkan.cpp
View
examples/imgui_impl_win32.cpp
View
examples/opengl3_example/main.cpp
View
examples/sdl_opengl3_example/main.cpp
View
examples/sdl_vulkan_example/main.cpp
View
examples/vulkan_example/main.cpp
View
imconfig.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h