Merge branch 'master' into navigation

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

docking

omar 7 years ago

parent 8e89809078 141339e4b7

commit 8581050002

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available