Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h docking
commit 3bcc25f588d4ecf2b334a4b8a9ccd70966c14445 2 parents e138a5f + 4cadb57 omar authored on 27 Nov 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below