commit | 2b662b1ab98fc74c89249630cd5ed0db34b7584d | [log] [tgz] |
---|---|---|
author | ocornut <omarcornut@gmail.com> | Tue Feb 20 15:33:20 2024 +0100 |
committer | ocornut <omarcornut@gmail.com> | Tue Feb 20 15:33:20 2024 +0100 |
tree | a395f2788427f3c14c7ef1056f40237a182d250b | |
parent | 8048b52498a9bf2a9f87b080d43b0bfd7a5d51d8 [diff] | |
parent | d3f1a7165cb5f6b0a7509e6829bbabe3a20dec8b [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp