Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp docking
commit f76872728425bc1e292dd2c7990a2c46546f3da3 2 parents e2082a6 + a03846b omar authored on 6 Dec 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/imgui_impl_win32.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below