Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit a03846bd9e24462e4fccafd1e977022e99e022f7 2 parents f3a0b17 + 125e624 omar authored on 6 Dec 2018

Patch

Unified Split

Showing 5 changed files

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

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below