Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_widgets.cpp docking
commit e6cc547a948a4dd44aaa56f317d6fafe48739667 2 parents 2eaf5b0 + e73217d omar authored on 12 Oct 2018

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below