...
Merge branch 'Cinder_master/master'

Conflicts:
	.gitignore
	README.md
	blocks/Cairo/include/cinder/cairo/Cairo.h
	blocks/Cairo/src/Cairo.cpp
	blocks/OSC/samples/OscListener/resources/CinderApp_ios.png
	blocks/TUIO/samples/TuioListener/resources/cinder_app_icon.ico
	blocks/__AppTemplates/BasicApp/OpenGL/include/Resources.h
	blocks/__AppTemplates/BasicApp/OpenGL/src/_TBOX_PREFIX_App.cpp
	blocks/__AppTemplates/ScreenSaver/OpenGL/include/Resources.h
	blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/English.lproj/InfoPlist.strings
	blocks/__AppTemplates/__Foundation/vc11/foundation.vcxproj.filters
	docs/HISTORY
	docs/doxygen/Doxyfile
	docs/doxygen/docsrc/guides/cinderboost/CinderBoost.dox
	docs/doxygen/docsrc/mainpage.dox
	docs/welcome/GitSetup.html
	include/cinder/Area.h
	include/cinder/Cinder.h
	include/cinder/CinderMath.h
	include/cinder/Color.h
	include/cinder/DataSource.h
	include/cinder/Display.h
	include/cinder/Function.h
	include/cinder/ImageTargetFileUiImage.h
	include/cinder/Matrix44.h
	include/cinder/MatrixAffine2.h
	include/cinder/MayaCamUI.h
	include/cinder/Path2d.h
	include/cinder/Plane.h
	include/cinder/Quaternion.h
	include/cinder/Rand.h
	include/cinder/Rect.h
	include/cinder/Stream.h
	include/cinder/Timeline.h
	include/cinder/TimelineItem.h
	include/cinder/Triangulate.h
	include/cinder/Tween.h
	include/cinder/Unicode.h
	include/cinder/Url.h
	include/cinder/Utilities.h
	include/cinder/Vector.h
	include/cinder/Xml.h
	include/cinder/app/App.h
	include/cinder/app/AppBasic.h
	include/cinder/app/AppCocoaTouch.h
	include/cinder/app/AppImplCocoaBasic.h
	include/cinder/app/AppImplMsw.h
	include/cinder/app/AppImplMswBasic.h
	include/cinder/app/AppScreenSaver.h
	include/cinder/app/FileDropEvent.h
	include/cinder/app/Renderer.h
	include/cinder/audio/Output.h
	include/cinder/cocoa/CinderCocoa.h
	include/cinder/gl/GlslProg.h
	include/cinder/gl/Texture.h
	include/cinder/gl/TextureFont.h
	include/cinder/gl/Vbo.h
	include/cinder/gl/gl.h
	include/cinder/params/Params.h
	include/cinder/qtime/MovieWriter.h
	include/cinder/qtime/QuickTime.h
	include/cinder/qtime/QuickTimeUtils.h
	include/cinder/svg/Svg.h
	include/cinder/svg/SvgGl.h
	samples/ArcballDemo/vc11/ArcballDemo.vcxproj
	samples/AudioGenerative/vc11/AudioGenerative.vcxproj
	samples/CairoBasic/vc10/CairoBasic.vcxproj
	samples/CaptureBasic/xcode/Info.plist
	samples/Earthquake/src/EarthquakeApp.cpp
	samples/FlickrTestMultithreaded/src/FlickrTestMultithreadedApp.cpp
	samples/FrustumCullingRedux/src/FrustumCullingReduxApp.cpp
	samples/HodginParticles/src/Particle.cpp
	samples/HodginParticlesRedux/src/HodginParticlesReduxApp.cpp
	samples/ImageHeightField/src/ImageHeightFieldApp.cpp
	samples/Kaleidoscope/vc10/Instascope.vcxproj
	samples/Kaleidoscope/xcode_ios/Instascope-Info.plist
	samples/OBJLoaderDemo/src/OBJLoaderApp.cpp
	samples/Picking3D/src/Picking3DApp.cpp
	samples/QuaternionAccum/src/QuaternionAccumApp.cpp
	samples/QuickTimeBasic/src/QuickTimeBasicApp.cpp
	samples/QuickTimeWriter/src/QuickTimeWriterApp.cpp
	samples/StereoscopicRendering/xcode/StereoscopicRendering.xcodeproj/project.pbxproj
	samples/StereoscopicRendering/xcode/StereoscopicRendering_Prefix.pch
	samples/Wisteria/vc10/Wisteria.vcxproj
	samples/_svg/AnimatedReveal/include/Resources.h
	samples/_svg/AnimatedReveal/vc10/AnimatedReveal.vcxproj
	samples/_svg/AnimatedReveal/vc10/AnimatedReveal.vcxproj.filters
	samples/_svg/EuroMap/include/Resources.h
	samples/_svg/EuroMap/vc10/EuroMap.vcxproj
	samples/_svg/EuroMap/vc10/EuroMap.vcxproj.filters
	samples/_svg/GoodNightMorning/include/Resources.h
	samples/_svg/GoodNightMorning/src/GoodNightMorningApp.cpp
	samples/_svg/GoodNightMorning/vc10/GoodNightMorning.vcxproj
	samples/_svg/GoodNightMorning/vc10/GoodNightMorning.vcxproj.filters
	samples/_svg/SimpleViewer/include/Resources.h
	samples/_svg/SimpleViewer/src/SimpleViewerApp.cpp
	samples/_svg/SimpleViewer/vc10/Resources.rc
	samples/_svg/SimpleViewer/vc10/SimpleViewer.vcxproj
	samples/_svg/SimpleViewer/vc10/SimpleViewer.vcxproj.filters
	samples/_svg/SimpleViewer/xcode/SimpleViewer_Prefix.pch
	samples/_timeline/BasicAppendTween/vc10/BasicAppendTween.vcxproj
	samples/_timeline/ImageAccordion/src/AccordionItem.cpp
	samples/_timeline/VisualDictionary/src/VisualDictionaryApp.cpp
	samples/basicApp/src/basicApp.cpp
	samples/perlinTest/vc10/perlinTest.vcxproj
	samples/slerpBasic/vc11/Resources.rc
	samples/waterSim/src/waterSimApp.cpp
	src/cinder/Area.cpp
	src/cinder/DataSource.cpp
	src/cinder/Display.cpp
	src/cinder/ImageSourceFileQuartz.cpp
	src/cinder/ImageSourceFileUiImage.mm
	src/cinder/ImageSourceFileWic.cpp
	src/cinder/ImageTargetFileQuartz.cpp
	src/cinder/ImageTargetFileUiImage.mm
	src/cinder/ImageTargetFileWic.cpp
	src/cinder/Path2d.cpp
	src/cinder/Rect.cpp
	src/cinder/Surface.cpp
	src/cinder/System.cpp
	src/cinder/Text.cpp
	src/cinder/Timeline.cpp
	src/cinder/TimelineItem.cpp
	src/cinder/Tween.cpp
	src/cinder/Unicode.cpp
	src/cinder/Url.cpp
	src/cinder/UrlImplCocoa.mm
	src/cinder/UrlImplWinInet.cpp
	src/cinder/Utilities.cpp
	src/cinder/Xml.cpp
	src/cinder/app/App.cpp
	src/cinder/app/AppBasic.cpp
	src/cinder/app/AppCocoaTouch.mm
	src/cinder/app/AppImplCocoaBasic.mm
	src/cinder/app/AppImplCocoaRendererGl.mm
	src/cinder/app/AppImplMsw.cpp
	src/cinder/app/AppImplMswBasic.cpp
	src/cinder/app/AppImplMswRendererGl.cpp
	src/cinder/app/AppScreenSaver.cpp
	src/cinder/app/CinderView.mm
	src/cinder/app/Renderer.cpp
	src/cinder/audio/OutputImplAudioUnit.cpp
	src/cinder/cocoa/CinderCocoa.mm
	src/cinder/gl/Fbo.cpp
	src/cinder/gl/Vbo.cpp
	src/cinder/gl/gl.cpp
	src/cinder/params/Params.cpp
	src/cinder/qtime/MovieWriter.cpp
	src/cinder/qtime/QuickTime.cpp
	src/cinder/qtime/QuickTimeUtils.cpp
	src/cinder/svg/Svg.cpp
	test/LineBreakTest/src/LineBreakTestApp.cpp
	test/ScreenSaverTest/xcode/Info.plist
	test/ScreenSaverTest/xcode/ScreenSaverTest.xcodeproj/project.pbxproj
	test/ScreenSaverTest/xcode/ScreenSaverTest_Prefix.pch
	test/XMLTest/src/XMLTestApp.cpp
	test/iPhoneTestGl/src/TestApp.cpp
	test/iosAppTest/xcode/iosAppTest.xcodeproj/project.pbxproj
	test/windowTest/src/windowTestApp.cpp
	test/windowTest/vc11/windowTest.sln
	tools/scripts/packageRelease.py
	tour/Section 2/Chapter 4/src/FlockingApp.cpp
	tour/Section 2/Chapter 5/src/FlockingApp.cpp
	tour/Section 2/Chapter 5/vc11/Resources.rc
	vc10/cinder.vcxproj
	vc10/cinder.vcxproj.filters
	vc11/cinder.sln
	vc11/cinder.vcxproj
	vc11/cinder.vcxproj.filters
	xcode/cinder.xcodeproj/project.pbxproj
	xcode/fullbuild.sh
...