Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp

...

This commit is contained in:

ocornut

2021-11-04 20:52:54 +01:00

parent c1d2793580 1a7526dcd4

commit b17dffffb3

5 changed files with 141 additions and 153 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

+119 -118

File diff suppressed because it is too large Load Diff