Merge branch 'master' into docking (note: won't build as-is, see next commit)

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
This commit is contained in:
ocornut 2023-11-02 17:56:54 +01:00
commit 9298e310b2
7 changed files with 360 additions and 159 deletions