Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit c40feabe4d0ed34cf68cf13ad77e52be748bb6b2 2 parents 26b9e2d + 54a60aa omar authored on 11 Dec 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

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

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below