Merge branch 'vulkan_fix_master' into vulkan_fix

Fork: 0

mark / imgui

Browse code Merge branch 'vulkan_fix_master' into vulkan_fix_docking # Conflicts: # examples/imgui_impl_vulkan.cpp docking
commit 29269d2aa8de0fd5e68160fe50e0be8887f4668f 2 parents 43a85dd + 0034e65 omar authored on 4 Apr 2019

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

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

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

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Show line notes below