Merge branch 'master_164' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master_164' into viewport_164 # Conflicts: # imgui.cpp # imgui_draw.cpp # imgui_widgets.cpp docking
commit 0c24fe276c6129253a8e37d56cba19395af171b1 2 parents c833912 + 48db571 omar authored on 31 Aug 2018

Patch

Unified Split

Showing 7 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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below