Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2022-02-07 18:20:10 +01:00
8 changed files with 35 additions and 29 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.87 WIP
// dear imgui, v1.87
// (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!