tree 33276059e5d0199ae32bd28fba042fd08674dd1f
parent f6951bb67d5a463e9deddac0ca0db2a132901924
parent 4ee7aa72e9fe86c3254f705829686438b5eebeef
author omar <omarcornut@gmail.com> 1578663489 +0100
committer omar <omarcornut@gmail.com> 1578663489 +0100

Merge branch 'master' into docking

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