Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 86d1abf3f6a326d6f838cb7f76c3352b7bcf7294
2 parents 1847270 + 05ee36b
@ocornut ocornut authored on 19 Apr 2015
Showing 3 changed files
View
imconfig.h
View
imgui.cpp
View
imgui.h