Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_demo.cpp docking
commit 5278da98d263873d3b274263e8bb0acf3bbcbebd 2 parents c3efcca + e1ed27a omar authored on 3 Jan 2019

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

Show line notes below