| commit | 9e30fb0ec1b44dc1b041db6bdd53b130b2a18509 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Mar 14 16:38:22 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Tue Mar 14 16:38:22 2023 +0100 |
| tree | ce70a3d76d1ef0178d42bed293aabb1bb36f5235 | |
| parent | 9937660b1cdf79a98b74647608f0e57a62a36e62 [diff] | |
| parent | f3f6295d532b98e322691afb8ef418209d963786 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # docs/CHANGELOG.txt # imgui.cpp