| tag | bbaab7a38305e26026d3ae7adfba8ac8e84e7a88 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Fri Oct 04 15:48:50 2024 +0200 |
| object | b4c96355c9b51b54c4deb52e7d7cdfc7bf79bc2f |
| commit | b4c96355c9b51b54c4deb52e7d7cdfc7bf79bc2f | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Oct 04 15:43:05 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Fri Oct 04 15:43:05 2024 +0200 |
| tree | 28d39f3d1d98abfe2432ed78c5bf7b1616855516 | |
| parent | 3293ef8bbcc009c7b98a3d83180c117dad56dc13 [diff] | |
| parent | cb16568fca5297512ff6a8f3b877f461c4323fbe [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp