Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 33b88a03396167426373f6dccd04cf8037a56933 2 parents 6cc380f + fbfe193 omar authored on 2 Oct 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below