Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp docking
commit ac9512e095f98555dece5891c1f41df0bef49d94 2 parents 9b09c75 + 65dac02 omar authored on 14 Dec 2018

Patch

Unified Split

Showing 5 changed files

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