Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-03-16 12:01:13 +01:00
44 changed files with 127 additions and 52 deletions

View File

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