Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

...

This commit is contained in:

ocornut

2024-07-18 18:22:26 +02:00

parent 0e485a2109 d7e605d430

commit fd77815f9f

6 changed files with 2535 additions and 81 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

1026

imgui_widgets.cpp

File diff suppressed because it is too large Load Diff