Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
commit 94c4e9564d955950bf526da64058dc54f915a981
2 parents 4f1acf0 + 05ee36b
@ocornut ocornut authored on 19 Apr 2015
Showing 3 changed files
View
imconfig.h
View
imgui.cpp
View
imgui.h