| commit | 64b88da21ba554eb5735a387d91d665cd387afdf | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Sep 09 20:48:57 2022 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Fri Sep 09 20:48:57 2022 +0200 |
| tree | 93e1c427703ab22ec3777c6723d8da8e174eeff7 | |
| parent | caf4b7f1e6190ec4b32c66aca3e94a9ef15c0378 [diff] | |
| parent | cb48c81a448aa0a4867e327c0a045a708ff3842e [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h