Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 31b5b18611ff3ee699e02b05740c28b7cec14c0e 2 parents 8601c39 + bb3184a omar authored on 5 Sep 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below