Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 13fab08cdb73c3989d8ba75a0b78948ef23cadea
2 parents 323ae83 + b9dd7c6
@ocornut ocornut authored on 8 Apr 2015
Showing 4 changed files
View
README.md
View
imgui.cpp
View
web/performance_01.png
View
web/performance_01_close_up.png 100644 → 0