imeteora/openFrameworks — pull request #2 by imeteora (2014-12-17 11:20:02+00:00)
Title: merge from the main repository

merge from the main repository