| commit | f6253b87d061b7cceabbf87e7836424e6593a5e0 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Nov 28 14:39:46 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Tue Nov 28 14:39:46 2023 +0100 |
| tree | 20b9fa1cd0012a3340aa5f03dd010e702a5270c4 | |
| parent | e07663d9a100a3d00f03edb62573f8c29d34a3ea [diff] | |
| parent | 6f171a066d64a15f43b69423329391c84bf49754 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdl3.cpp # imgui.cpp