| commit | 450f1d7e7b9ee2dd03dd69fb0402a78b1a9b0b34 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Nov 10 14:56:10 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Fri Nov 10 14:56:10 2023 +0100 |
| tree | 88b8ff1e5cf9734a87274f01247be1487e318d3f | |
| parent | 37ea320b96a4b77581986f5581707021a7be94c9 [diff] | |
| parent | 79a9e2fdfbbd2b6cc355236a0d55567c06e32190 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_vulkan.cpp # imgui.cpp