861f786d816eac498be9ef95a3fabe49289ea6ee - external/github.com/ocornut/imgui - Git at Google

commit: 861f786d816eac498be9ef95a3fabe49289ea6ee
[log]
author: omar <omarcornut@gmail.com>
Fri Jan 10 14:38:09 2020 +0100
committer: omar <omarcornut@gmail.com>
Fri Jan 10 14:38:09 2020 +0100
tree: 33276059e5d0199ae32bd28fba042fd08674dd1f
parent: f6951bb67d5a463e9deddac0ca0db2a132901924 [diff]
parent: 4ee7aa72e9fe86c3254f705829686438b5eebeef [diff]

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp

tree: 33276059e5d0199ae32bd28fba042fd08674dd1f