Merge branch 'master' into docking

Browse Source

# Conflicts:
#	backends/imgui_impl_glfw.cpp

...

This commit is contained in:

ocornut

2025-03-03 18:57:42 +01:00

parent 15b96fd051 71b160cdbb

commit 935938bbd9

7 changed files with 1590 additions and 1348 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

2900

imgui_demo.cpp

File diff suppressed because it is too large Load Diff