tree a0a2a54b456f04e0bcc14222c2bbfbd92ec3981a
parent 3d4af15d1d5f5d3746b69859308949c357e0c21e
parent 218ff3a2a5186a91bf1a053468e66727d1c34d73
author omar <omarcornut@gmail.com> 1596028514 +0200
committer omar <omarcornut@gmail.com> 1596028514 +0200

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_draw.cpp
#	imgui_internal.h