Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/vulkan_example/main.cpp # imgui.h docking
commit 56ad2a2d74944712afa24416d3ab2d94c88cb086 2 parents f421e73 + 660c157 omar authored on 9 Apr 2018

Patch

Unified Split

Showing 16 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

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

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

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

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

Ignore Space Show notes View examples/imgui_impl_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

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

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

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

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below