Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

...

This commit is contained in:

omar

2018-08-22 21:35:44 +02:00

parent 9d7480774f 7011d87bf8

commit a4191857c1

15 changed files with 461 additions and 199 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

imgui.cpp

+200 -101

File diff suppressed because it is too large Load Diff