Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.h docking
commit 2a1e903f43911c959e2df7df82d70896fd65691b 2 parents e50894c + 8497948 omar authored on 13 Dec 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

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

Show line notes below