Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2023-11-28 14:39:46 +01:00
14 changed files with 180 additions and 138 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.90.0
// dear imgui, v1.90.1 WIP
// (demo code)
// Help: