Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
This commit is contained in:
ocornut
2024-09-04 16:58:44 +02:00
16 changed files with 123 additions and 63 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.1 WIP
// dear imgui, v1.91.1
// (drawing and font code)
/*