Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h docking
commit b30b82835a285af00951f186ce5e5672f22b947b 2 parents d107146 + b629f90 omar authored on 12 Jul 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below