Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h docking
commit 02501f07c306da9c0144f64615e6fb60307efcb5 2 parents a0e5bb9 + 39dde66 omar authored on 20 Dec 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Show line notes below