Merge branch 'viewport' into docking. 15ec78e Fixes the update of title buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate().
# Conflicts:
#	imgui.cpp
commit 7525637804c7200bc66455ebeab9d206174992e6
2 parents 7b3433c + 15ec78e
@omar omar authored on 11 Oct 2018
Showing 1 changed file
View
imgui.cpp