Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdlrenderer.h
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2023-05-31 14:51:56 +02:00
34 changed files with 1023 additions and 212 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89.6 WIP
// dear imgui, v1.89.6
// (widgets code)
/*