| commit | eb42e164dde71877c894b8fee4a555a738c0406b | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Mon Jan 22 19:01:25 2024 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Mon Jan 22 19:01:25 2024 +0100 |
| tree | ec99ba4c7e0c43c001aacfac7febd0df1fb18059 | |
| parent | 01b99a974dee45181a8fecc70dfb5360852fdff7 [diff] | |
| parent | a201af7354435f1167046bb1fa4c32dd2a6a1c8d [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_vulkan.cpp