Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 0095b7a0ea8003d367b81042059856008a463ee9 2 parents 6b4f6cd + 28c1a98 omar authored on 26 Jul 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below