Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 753223bd7b9d42eaa57b01efa643e90f80ddb5d7 2 parents 3c114b2 + f663277 omar authored on 30 Nov 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View imgui.cpp

Show line notes below