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 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
Add .gitattributes file to better deal with line endings.
updated ios moviePlayerExample

changed ofiPhoneVideoPlayer to ofxiOSVideoPlayer
Merge branch 'master' of https://github.com/openframeworks/openFrameworks into ios-movie-player-example-fix
Merge pull request #2541 from julapy/ios-movie-player-example-fix

ios movie player example fix
makefiles: fix external directories + show pkg config being checked
ofParameterGroup: fix by name index
Merge branch 'master' of github.com:openframeworks/openFrameworks
several fixes for ofParameter & parameter osc sync
ofxOscSender: send ofParameters only if they are serializable