| tag | 65a75f65ea3b2c0b09eb6eb7699b1c8c38607228 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Tue Jul 30 17:02:59 2024 +0200 |
| object | 139e99ca37a3e127c87690202faec005cd892d36 |
| commit | 139e99ca37a3e127c87690202faec005cd892d36 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Jul 30 16:57:42 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Tue Jul 30 16:57:42 2024 +0200 |
| tree | fdc689f9798fd9272f2f9e0af65ac888084e3fde | |
| parent | 6df1a06fc31c6abc320ed1ddd47080f5c31cc2ce [diff] | |
| parent | 8199457a7d9e453f8d3d9cadc14683fb54a858b5 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp