Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.h docking
commit 6cfc9e6256ac00537fee8c4bb4d7d4e22ad3d9cc 2 parents 1ab236d + 6bda816 omar authored on 17 Mar 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Show line notes below