mirror of
https://github.com/ocornut/imgui.git
synced 2026-11-16 19:11:13 +00:00
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:
commit
9298e310b2