first test example with ofShader allowing #pragma includes - check devApps/ShaderIncludeDev/ to see the example. currently only allows includes in shaders loaded as a file
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes is working with setupShaderFromSource and setupShaderFromFile
ofShader support for #pragma includes supports duplicate inclusion
ofShader support for #pragma includes supports duplicate inclusion
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks
Merge pull request #1795 from chparsons/feature-shader-include

Feature shader include
merged ofShader parse for include feature
Merge branch 'master' of github.com:openframeworks/openFrameworks
Update ofColor == and != operators to also test alpha
Merge pull request #2512 from rbeitra/master

Fix for issue #2496 (ofColor == and != operators ignoring alpha)
tiny log fix in ofSerial
Merge pull request #2518 from armadillu/ofSerialLogMissingSpace

tiny log fix in ofSerial
bug fix - template ofApp needs to extend ofxiOSApp

fixes #2514
Merge pull request #2521 from julapy/ios-fix-ofApp-template

bug fix - template ofApp needs to extend ofxiOSApp
ofGst* separate the setPipeline and startPipeline calls to have more control on the initialization
Update CONTRIBUTE.md with the latest branch structure changes.