Merge branch 'viewport' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt docking
commit ac10889bdebb7a477c7bb4f3aea1bb3ebc8558a9 2 parents 34e18ef + 89a530b omar authored on 3 Dec 2018

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj

Ignore Space Show notes View examples/imgui_impl_win32.h

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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below