Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

ocornut

2024-09-27 19:03:25 +02:00

parent aa81272900 199a44e31e

commit d1ea03b872

7 changed files with 435 additions and 206 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

+307 -169

File diff suppressed because it is too large Load Diff