Merge branch 'master' into docking

Browse Source

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_demo.cpp

...

This commit is contained in:

ocornut

2026-02-20 18:07:02 +01:00

parent ad769352ea 37b7a7a9df

commit 352a7f101a

12 changed files with 298 additions and 250 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

326

imgui_demo.cpp

File diff suppressed because it is too large Load Diff