| commit | 1450d23b60a92713de2d1969b665d09ca8ac83b2 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Jun 20 15:08:52 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Tue Jun 20 15:12:09 2023 +0200 |
| tree | 32483019ddfd525216160e887f22a4f8cd0ec102 | |
| parent | b9db5c566bbafa3462f1a526032ca2971742db17 [diff] | |
| parent | 9214c28aad07e634cdb6ed578663391279e73340 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # docs/CHANGELOG.txt # imgui.cpp