| tag | 2ae16655a7072546bb23a3dfc8e1735cf0185b29 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Thu Jun 06 17:56:10 2024 +0200 |
| object | 6d948ab47ecf984239af01434f3ed03808dbf188 |
| commit | 6d948ab47ecf984239af01434f3ed03808dbf188 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Jun 06 17:52:55 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Jun 06 17:52:55 2024 +0200 |
| tree | 2c29e9bb02ec67b8dc7675152c91fdcea14ddfb9 | |
| parent | fdc084f532189fda8474079f79e74fa5e3541c9f [diff] | |
| parent | 6f7b5d0ee2fe9948ab871a530888a6dc5c960700 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp