Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport docking
commit 8657201257863844fee2fe20d406ef2b53680512 2 parents b884927 + 0e3a6ef omar authored on 13 Mar 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .github/pull_request_template.md

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Show line notes below