mirror of
https://github.com/ocornut/imgui.git
synced 2026-05-12 01:53:29 +08:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # docs/CHANGELOG.txt
This commit is contained in: