Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit ff4f40de4193da31860065332e5574b021884482 2 parents 24fc7c3 + 8e48ab6 omar authored on 8 Jun 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View misc/fonts/README.txt

Ignore Space Show notes View stb_textedit.h

Show line notes below