| commit | 4fc187dc603aefbbeb319fe5f6ad62dd1040347c | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Aug 23 19:19:22 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Fri Aug 23 19:19:22 2024 +0200 |
| tree | 1ef33c5c15bf153781eac1fbf4667fab713e0c8a | |
| parent | 947961b7b4d3be8a42a2ec69c63504105794c9b5 [diff] | |
| parent | 864a2bf6b824f9c1329d8493386208d4b0fd311c [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp