Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit a0c2e55e8c25eaf119a7e80fb4cc43c257a83a97 2 parents 0cabe4d + 237109c omar authored on 2 Jan 2019

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below