Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport docking
commit a52ce7ac8b257503083fe7e6d842fa73fe598daa 2 parents fd90afe + 9174958 omar authored on 31 Aug 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View misc/stl/imgui_stl.cpp

Ignore Space Show notes View misc/stl/imgui_stl.h

Show line notes below