Merge remote-tracking branch 'origin/master' into docking

Browse source

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar 2026-09-25 15:38:34 +02:00

parent 3bae66c735 aa0181478b

commit 64944b4520

8 changed files with 56 additions and 43 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

2

backends/imgui_impl_opengl3_loader.h

View file

16

docs/CHANGELOG.txt

View file

40

imgui.cpp

View file

1

imgui_draw.cpp

View file

21

imgui_internal.h

View file

10

imgui_tables.cpp

View file

2

imgui_widgets.cpp

View file

7

misc/freetype/imgui_freetype.cpp

View file