ofAppGLFWWindow: add linux icon
Merge branch 'feature-elinuxProgrammableGL' of github.com:arturoc/openFrameworks into feature-elinuxProgrammableGL
fix a critical bug for fixed function pipeline glDrawElements calls

+ if VAOs were not supported (GL2), no indices buffer was bound upon glDrawElements, which leads to bad things happening.

this fix takes care of that by binding the indices buffer if VAOs are not supported.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
Merge pull request #16 from tgfrerer/feature-elinuxProgrammableGL

Feature elinux programmable gl
ofAppGLFWWindow: linux icon
Merge branch 'feature-elinuxProgrammableGL' of github.com:arturoc/openFrameworks into feature-elinuxProgrammableGL
Merge pull request #2096 from LeoColomb/Fix-IconVS2012

Fix Icon VS2012
added comment regarding ofParameter typedef friending
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
small fixes for iOS compilation.
Merge branch 'feature-elinuxProgrammableGL' of https://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
Merge pull request #2015 from arturoc/feature-priorityAttendedEvents

mark events as attended
ofAppGLFWWindow: remove commented code
Merge pull request #2095 from kylemcdonald/feature/ofDirectory-natural

ofDirectory natural sort order
Merge branch 'develop' of github.com:openframeworks/openFrameworks into mergedevelopProgrammableGL

Conflicts:
	libs/openFrameworks/events/ofEvents.cpp
	libs/openFrameworks/events/ofEvents.h
Merge branch 'develop' of github.com:openframeworks/openFrameworks into feature-elinuxProgrammableGL
removing duplicate ofTexture
removed more fps stuff
added not about setSaturation