Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

...

This commit is contained in:

ocornut

2023-09-04 14:59:59 +02:00

parent 300464a487 fef3389157

commit a1b60fc1f5

10 changed files with 314 additions and 290 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

+89 -111

File diff suppressed because it is too large Load Diff