Merge branch 'develop' of github.com:armadillu/openFrameworks into develop
Merge remote-tracking branch 'upstream/develop' into develop
ios es2 cleanup

- fixes shader errors in issue #2233 with the use of ofGLReadyCallback()
- added enableRendererES20() and enableRendererES11() methods to
ofAppiPhoneWindow
- updated code that references ofGLProgrammableRenderer, mainly now
using ofIsGLProgrammableRenderer() which was recently introduced.
- cleaned up ofAppiPhoneWindow (formatting + removed old code)
fixes for CB against develop
ofVboMesh: copy constructor for ofMEsh, trying to fix possible leak
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
ofVboMesh: revert last changes
ofGraphics: dont include cairo renderer for android and ios
ofVboMesh: trying to fix potential leak
ofVbo: copy operator wasn't clearing previous buffers
ofVboMesh: remove debug trace
Merge pull request #2253 from danomatika/develop

added ofGetBackground & various small example tweaks/updates
Merge remote-tracking branch 'upstream/develop' into develop
added support for tab key OF_KEY_TAB / '\t'
Merge pull request #2254 from openframeworks/glfw-tabfix

added support for tab key OF_KEY_TAB / '\t'
added compile c as cpp flag for VS template. for ofxKinect.
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Merge pull request #2255 from openframeworks/bugfix-win-template

added compile c as cpp flag for VS template. for ofxKinect.
PG: update to master
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop