Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h docking
commit 0b1d6a0d52e8d7767d710d48ed8e81c2e698c861 2 parents 7b43360 + 711a63b omar authored on 25 Apr 2018

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below