tree 340214ab1f860c45725d46f3d5d92e3a0d127d2d
parent fd13a1e8923a0a7077b404fc36fd063b25a0c0b5
parent 4dbb921b228c33a78eca4914898709b7ac93671e
author ocornut <omar@miracleworld.net> 1788362871 +0200
committer ocornut <omar@miracleworld.net> 1788362871 +0200

Merge branch 'master' into docking

# Conflicts:
#	imgui_internal.h