Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp docking
commit e6439e1a169ab908a63fac733ae007ad09ee4a58 2 parents 3a5e758 + 26b9e2d omar authored on 10 Dec 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_win32_directx11/main.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

Show line notes below