create_package.sh: fix bad formatted conditional
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks.git into develop
create_package: android and ios, remove gles and gui examples
sorting example fixes
changed ofEnableSmoothing call to ofEnable/DisableAntiAliasing as AA is on by default now.
small fix for osxHighPerformanceVideoPlayerExample so it can build on 10.6.8
Merge pull request #2428 from openframeworks/example-fixes

Example fixes - addresses issues for 0.8.0 examples in #2425
modify vboMeshDrawInstanced example to allow renderer selection

This change allows the example to run using either the fixed function pipeline / OpenGL 2.0 + GLSL 1.20 or OpenGL 3.2 + GLSL 150, depending on an #ifdef set in testApp.h

By default, this example will run using the fixed function GL renderer. (OpenGL 2.0)

Bonus: Two shader pairs (one GLSL 1.20 one GLSL 150 ) allow you to compare syntax differences between the two shader language versions.
Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #2430 from tgfrerer/fix-vboMeshDrawInstanced-Example

Fix vbo mesh draw instanced example
special case for ofDrawBox with ofNoFill active. Uses GL_LINES to render, so the triangles are not visible
fix for vboMeshDrawInstancedExample - detect if glDrawElementsInstanced is available and if not, exists the app with fatal error. closes #2427
Merge pull request #2431 from NickHardeman/feature-drawBox-wireframe

ofDrawBox uses GL Lines, instead of triangles
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks.git into develop