Merge branch 'vulkan_fix_master' into vulkan_fix_docking

Browse Source

# Conflicts:
#	examples/imgui_impl_vulkan.cpp

...

This commit is contained in:

omar

2019-04-04 23:55:33 +02:00

parent 43a85dd02e 0034e65c26

commit 29269d2aa8

5 changed files with 409 additions and 299 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

examples/imgui_impl_vulkan.cpp

+218 -203

File diff suppressed because it is too large Load Diff