Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit a2616c79fe24f0e1a5f8170369c97b4dd7bf2b32 2 parents 31b5b18 + e58bc3d omar authored on 6 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_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below