Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h

...

This commit is contained in:

ocornut

2025-11-17 15:38:58 +01:00

parent ae1d278f3a b885382a63

commit 219ba3b617

19 changed files with 714 additions and 293 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

+163 -148

File diff suppressed because it is too large Load Diff