Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui_demo.cpp

...

This commit is contained in:

ocornut

2021-11-10 15:26:03 +01:00

parent b17dffffb3 7cd3cfa58a

commit dc8c3618e8

8 changed files with 222 additions and 28 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

177

imgui_demo.cpp

File diff suppressed because it is too large Load Diff