| commit | 96b5b1724b677aa03ca4a3d720367beba9a980a3 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Dec 05 12:20:16 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Tue Dec 05 12:20:16 2023 +0100 |
| tree | 82c1c257e83c285cdd29353481d88aeb5e6aa4d3 | |
| parent | f6253b87d061b7cceabbf87e7836424e6593a5e0 [diff] | |
| parent | 1fd5ff71520248dfe1cd51315a16b0ff93f81905 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_vulkan.cpp # imgui_internal.h