| commit | e3d7cd665d9b8cf7c78166ed774bf47e502dd6be | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Jan 03 18:33:44 2024 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Jan 03 18:33:44 2024 +0100 |
| tree | 2f5b5abf7ced99a235039785f8f7c62f07241364 | |
| parent | 2523c197bc0c91d5aeb16131b0b0fd300a11bb06 [diff] | |
| parent | 6f10cef2a1fc15c45ed61a8a427ccd7f45fb8bf0 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_vulkan.cpp