Browse code Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp docking
commit 5105c6c0d0adea4e200f2f15969714e0111c80b9 2 parents 8bac6d4 + 3a678d4 omar authored on 3 Dec 2018

Showing 11 changed files

• docs/CHANGELOG.txt
• docs/TODO.txt
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx12.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.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