Merge branch 'master' into docking

Browse Source

# Conflicts:
#	backends/imgui_impl_glut.cpp
#	backends/imgui_impl_glut.h
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_demo.cpp

...

This commit is contained in:

ocornut

2024-11-06 17:58:35 +01:00

parent fe2fa2d08e df0776e931

commit 83660e37e3

31 changed files with 828 additions and 658 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

+75 -209

File diff suppressed because it is too large Load Diff