Update for correct resolution parameters
fix for res args in box
Merge branch 'master' of https://github.com/openframeworks/openFrameworks into develop
re-enabling the uniqueShader for the RPi due to large texture performance drops
orientation does not change on face down or face up. Was defaulting to portrait
Merge pull request #2878 from jvcleave/unique-shader-revert

re-enabling the uniqueShader for the RPi due to large texture performanc...
Merge pull request #2877 from NickHardeman/develop

Fix for mesh resolution parameters.
updated project generators for all platforms and build locations back to OF site
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
Merge pull request #2879 from jedahan/master

fix tr1/memory compile issue on OS X 10.9 for makefiles
small fix for orientationExample - check that the normal is not zero length before trying to orient to it.
Merge branch 'master' of https://github.com/openframeworks/openFrameworks