Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 9c916cdaf9fe54b7ef642c68047323780c037848 2 parents 5d20da1 + ae76a1f omar authored on 18 Dec 2018

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/pull_request_template.md

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

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below