Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 23b67e6ff5b1b68d18d467dee8d0e3c8cd438c79 2 parents 7b4fbf4 + 93321d3 omar authored on 17 Jul 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Show line notes below