Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_demo.cpp docking
commit 26b9e2d0a5c2f47259527c2094f6c927b38855c5 2 parents a03846b + 9476e07 omar authored on 10 Dec 2018

Patch

Unified Split

Showing 6 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_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below