Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h docking
commit f81caac459c40be0b568f4bc29d3b988ff5a9aac 2 parents 0ada716 + 4dea032 omar authored on 25 Aug 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View CHANGELOG.txt

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

Ignore Space Show notes View examples/imgui_impl_vulkan.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