dd4ca70b0d612038edadcf37bf601c0f21206d28 - external/github.com/ocornut/imgui.git - Git at Google

commit: dd4ca70b0d612038edadcf37bf601c0f21206d28
[log] [tgz]
author: ocornut <omarcornut@gmail.com>
Fri Dec 04 19:22:15 2020 +0100
committer: ocornut <omarcornut@gmail.com>
Fri Dec 04 19:22:15 2020 +0100
tree: 553021e4113cfc38bc5ba2127dcf3cb66066111f
parent: 657589ab47b31e66804c71fbcdaf0f72e8e4f146 [diff]
parent: 9874077fc0e364383ef997e3d4332172bfddc0b9 [diff]

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp

tree: 553021e4113cfc38bc5ba2127dcf3cb66066111f