Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp docking
commit 3a678d48b16ff95893d9cf5bef8a5789efa4f187 2 parents f6b6ad1 + fb6ef8b omar authored on 3 Dec 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/imgui_impl_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below