mirror of
https://github.com/ocornut/imgui.git
synced 2026-05-20 04:17:51 +08:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt
This commit is contained in:
# Conflicts: # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt