Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport docking
commit 64cbbed15288eba8204738203cceadca8f76690f 2 parents 43f375b + 351b3fa omar authored on 9 Mar 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.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

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below