Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h docking
commit e25da4230b7d4fd6ff5213d51b354f25b1d6140a 2 parents 8be6f40 + d1d2bbf omar authored on 11 Apr 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below