tree 05bb7836bc3429076be43df05be4f0e53d491f9c
parent 7a5196601e96ccc880ea00e5aed0ef3a786edad2
parent 3d8ea352d1f11e9ae2dc6fe4ff457106bb1f224c
author omar <omarcornut@gmail.com> 1553526489 +0100
committer omar <omarcornut@gmail.com> 1553526489 +0100

Merge branch 'master' into docking

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