Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
This commit is contained in:
ocornut
2022-02-17 18:47:43 +01:00
20 changed files with 169 additions and 124 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.87
// dear imgui, v1.88 WIP
// (demo code)
// Help: