Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags # Conflicts: # imgui.cpp # imgui.h docking
commit af27ec296b482e85aef738402c094dd4ba9096b6 2 parents a848807 + 65876f3 omar authored on 5 Sep 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View docs/CHANGELOG.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_widgets.cpp

Show line notes below