Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit c52cefa2c23ea676bce09bf8f5c8ed38d5731139
2 parents 0d5e6e1 + 562aecd
@ocornut ocornut authored on 5 Jul 2015
Showing 2 changed files
View
imgui.cpp
View
imgui.h