ofEvents: report both OF_KEY_CONTROL/SHIFT/ALT/SUPER and LEFT/RIGHT
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Fix VS2012 projects & compilation

* ofxXmlSettings location
* .vcxproj.user update
* Compile As Cpp option
Fix ofLogNotice() in ofDirectShowGrabber
updated freetype for osx to 2.5.0.1. working towards #298, still need windows
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Merge pull request #2326 from LeoColomb/Fix-ofLog

Fix ofLogNotice() in ofDirectShowGrabber
Merge pull request #2325 from LeoColomb/Fix-VS2012--Projects

Fix VS2012 projects & compilation
Update ofImage.cpp

fixing typos
Merge pull request #2327 from danthemellowman/patch-6

Update ofImage.cpp
Update visualstudio.md
adds ofEnable/DisableAntiAliasing that works at runtime
fixes enableAntialiasing -> enableAntiAliasing in several renderers
Fix unbalanced parentheses in ofLog calls.
Merge pull request #2328 from arturoc/feature-antialiasingruntime

adds ofEnable/DisableAntiAliasing that works at runtime
xmlExamples: disable antialiasing to make lines look better. Closes #2323
Merge pull request #2329 from bilderbuchi/oflog-fixes

Fix unbalanced parentheses in ofLog calls.
remove duplicated GPUparticleSystemExample. Closes #2330
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
ofAppRunner and windows: getters for native windows and gl contexts