Merge branch 'master' into docking

Browse Source

# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp

...

This commit is contained in:

ocornut

2021-11-03 11:51:37 +01:00

parent bac748fa95 14466a6d19

commit 0b4edf4e94

10 changed files with 281 additions and 168 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

+157 -132

File diff suppressed because it is too large Load Diff