| commit | 0110f4c8cc0f09b0d0b7b8b787e6367356bd3c63 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Jul 12 18:17:44 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Wed Jul 12 18:19:24 2023 +0200 |
| tree | 63ba3189cf98cfab12e8ffc055e40109541e7c1b | |
| parent | 51b348095c07b19dd42c3a286745e826edc12261 [diff] | |
| parent | dbeeeae593a0b35b1a58b7b3f90590546e73aa9d [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h