tree 692d7265fc18974a351cecfcb2bbb70e688e7f4c
parent d049a7988c9c569ff240533e96d8500f3a715cab
parent 0537ac005f7e76311556a4e24c8ddfb4fa1bdcc8
author omar <omarcornut@gmail.com> 1567271940 +0200
committer omar <omarcornut@gmail.com> 1567271940 +0200

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_internal.h