Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp docking
commit b26f16a27f1b1acf5d631cc4a37310d81004c625 2 parents 5aebfed + a0c2e55 omar authored on 2 Jan 2019

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below