Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit d77082af003187171c831f445f149f529e6d315a
2 parents 282532a + 92a22ab
@ocornut ocornut authored on 20 Mar 2015
Showing 3 changed files
View
imconfig.h
View
imgui.cpp
View
imgui.h