Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	docs/CHANGELOG.txt
#	docs/TODO.txt
This commit is contained in:
ocornut
2023-07-04 14:58:03 +02:00
15 changed files with 143 additions and 81 deletions

View File

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