Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp docking
commit 9b09c7597f6909adb09e7b3bc5f93df621d3712d 2 parents 991b16c + 2a1e903 omar authored on 13 Dec 2018

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Show line notes below