Merge branch 'master' into docking

# Conflicts:
#	imgui.h
This commit is contained in:
ocornut
2021-10-15 11:49:30 +02:00
9 changed files with 53 additions and 29 deletions

View File

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