Merge branch 'master' into es2
Added Color and ColorA variants to GlslProg::uniform
Initial commit of timeline code
Initial checkin of BasicTween and DragTween samples
Integrating a realtime timeline into App
Moving DragTween to using App's primary timeline
Fixing missing cinder prefixes on Timeline include paths
Integrating Timeline into VC10
Porting BasicTween timeline sample to vc10
Merge branch 'timeline' of github.com:andrewfb/Cinder into timeline
Merge remote branch 'cinder-origin/master' into timeline
Ported DragTween to iOS
Merge remote branch 'cinder-origin/master' into timeline
Porting timeline and DragTween sample to vc9
Merge branch 'timeline' of github.com:andrewfb/Cinder into timeline
Ported BasicTween sample to vc9
Merge branch 'timeline' of github.com:andrewfb/Cinder into timeline
Simplified BasicTween sample
Initial commit of timeline/CustomLerp sample
Initial checkin of timeline/CustomCallback sample