| commit | 5717f0a33e53ff4e68a90b1cb06fde3ed7d54da8 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Apr 30 10:42:46 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Tue Apr 30 10:42:46 2024 +0200 |
| tree | 5cf538a11d1a8398c411719ee4b360d0ccb73cb1 | |
| parent | b555984a94b1c5a5f2f192d1513547c4b112c976 [diff] | |
| parent | 50b2ff0bf039aac26210a184113bfb116b43e7af [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_win32.cpp