Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 245cf36522ab15e31f5b57984106ada2b625fb9a
2 parents 890585c + 08b1dd1
@ocornut ocornut authored on 8 Jul 2015
Showing 2 changed files
View
imgui.cpp
View
imgui.h