Merge branch 'examples_refactor' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'examples_refactor' into viewport # Conflicts: # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx12_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.h docking
commit fc80f2b41ab0b3cc44cd69f78d73f86b85c85835 2 parents 00b9e70 + 68e9ef9 omar authored on 1 Mar 2018

Browse code

# Conflicts:
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx12_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.h

docking

commit fc80f2b41ab0b3cc44cd69f78d73f86b85c85835

2 parents 00b9e70 + 68e9ef9

omar authored on 1 Mar 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Ignore Space Show notes View examples/opengl3_example/main.cpp

Ignore Space Show notes View examples/sdl_vulkan_example/main.cpp

Ignore Space Show notes View examples/vulkan_example/main.cpp

Show line notes below