tree f247e9dddf0d682281c97d8bca90c3e7785b2b6c
parent bed11b35d1b3150f68ff067212911cd954c58c6e
parent 1ebb91382757777382b3629ced2a573996e46453
author ocornut <omarcornut@gmail.com> 1681395849 +0200
committer ocornut <omarcornut@gmail.com> 1681395849 +0200

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h