Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
cleanup for ofFbo.cpp - tries to reduce redundent code and also better support for POT textures. Lots of fixes for iOS also. Please take a look.
Better fix for issue #1253 - recompiled openCV 2.3.1 for mingw32 with -O3 and -mstackrealign
Merge pull request #1265 from gameoverhack/bugfix-openCV231

Better fix for issue #1253. openCV 2.3.1 mingw32 compiled with SSE/SSE2, -O3 and -mstackrealign
Fixed multiple inheritance ambiguity
Merge pull request #1267 from roymacdonald/fix-multipleInheritance

Fix multiple inheritance ambiguity
small fix for textureTarget typo
removed frameCount.
it was there to optimise unnecessary calls to the update function but i think it can potentially cause issues when wanting to perform multiple video player operations on the one frame.
Adding basic linux cb project files - needs work
fixed debug / release lib adding logic
Changed method for sorting Release and Debug libs. Fixes issue #1268
finished the comment
Merge branch 'bugfix-PGVSlibs' of https://github.com/gameoverhack/openFrameworks into merge-matt

Conflicts:
	apps/devApps/projectGenerator/src/projects/visualStudioProject.cpp
Resolved merge conflict with Zach's last commit
Merge branch 'bugfix-PGVSlibs' of https://github.com/gameoverhack/openFrameworks into develop
Add libmpg123-devel to fedora codec install script. Closes #844.
ofAppAndroidWindow: fix texture reloading
OFAndroid: fix touch events by reading history
Merge pull request #1244 from julapy/bugfix-ios-moviePlaye

movie player fixes / optimisations
fixed an issue on win cb where the float equality test was failing for this example, which broke it