mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-20 20:00:40 +00: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: