Merge branch 'examples_refactor2' into viewport (#1870)
# Conflicts:
#	examples/README.txt
#	examples/directx11_example/main.cpp
#	examples/directx12_example/main.cpp
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl2.cpp
#	examples/imgui_impl_sdl2.h
#	examples/imgui_impl_vulkan.cpp
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/sdl_vulkan_example/main.cpp
#	examples/vulkan_example/main.cpp
#	imgui.cpp
#	imgui.h
commit 13a3a2d0f32b4331b41823cf339972965c68d589
2 parents ff4f40d + 85f9694
@omar omar authored on 10 Jun 2018
Showing 20 changed files
View
CHANGELOG.txt
View
examples/directx12_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_dx9.cpp
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_opengl2.cpp
View
examples/imgui_impl_opengl3.cpp
View
examples/imgui_impl_sdl2.cpp
View
examples/imgui_impl_sdl2.h
View
examples/imgui_impl_vulkan.cpp
View
examples/imgui_impl_vulkan.h
View
examples/imgui_impl_win32.cpp
View
examples/opengl2_example/main.cpp
View
examples/sdl_opengl2_example/main.cpp
View
examples/sdl_opengl3_example/main.cpp
View
examples/sdl_vulkan_example/main.cpp
View
examples/vulkan_example/main.cpp
View
imgui.h