Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp docking
commit 168af9b3777c0c3701b9222d95b085334adc52dc 2 parents 1a6eea0 + 50f6e12 omar authored on 25 Oct 2018

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

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_internal.h

Ignore Space Show notes View imgui_widgets.cpp

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

Show line notes below