search

openFrameworks-RaspberryPi / openFrameworks

This repo has migrated into the openFramworks core! Please go to http://github.com/openFrameworks/openFrameworks for the latest!
http://github.com/openFrameworks/openFrameworks
Other
104 stars 11 forks source link

Merge Upstream Develop #90

Closed bakercp closed 11 years ago

bakercp commented 11 years ago

This is mostly an easy merge with a few manual updates, but @arturoc could you help resolve the ofEvent.h/ofEvent.cpp clash?