Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit df65d4a14f9f5a15eea8a7ae03e3d26f32f7e5d4 2 parents b974fff + d014d02 omar authored on 11 Sep 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_glfw_vulkan/CMakeLists.txt

Ignore Space Show notes View examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj

Ignore Space Show notes View examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters

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

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below