Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # docs/TODO.txt docking
commit 515ad6233550b417793f39cefbb5be0f80b94df9 2 parents ff4bd75 + 73353fa omar authored on 15 Jan 2019

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below