Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-02-15 18:18:47 +01:00
10 changed files with 51 additions and 22 deletions

View File

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