Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h docking
commit 3c114b280afd9e4bd7b46fbff5a3b16185ed0dc5 2 parents 19d17ed + 2fbbcaa omar authored on 29 Nov 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View examples/example_win32_directx12/main.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Show line notes below