Skip to content

Commit

Permalink
Merge branch 'keyframe' of github.com:koenbok/Framer into keyframe
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen Bok committed Mar 22, 2013
2 parents 1018b69 + b5cef35 commit cda5559
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/animation.coffee
Original file line number Original file line Diff line number Diff line change
@@ -1,12 +1,12 @@
_ = require "underscore" _ = require "underscore"
utils = require "../utils" utils = require "./utils"
css = require "../css" css = require "./css"


{EventEmitter} = require "./eventemitter" {EventEmitter} = require "./eventemitter"
{Matrix} = require "../primitives/matrix" {Matrix} = require "./primitives/matrix"


spring = require "../curves/spring" spring = require "./curves/spring"
bezier = require "../curves/bezier" bezier = require "./curves/bezier"


AnimationCounter = 0 AnimationCounter = 0


Expand Down Expand Up @@ -355,4 +355,4 @@ class Animation extends EventEmitter






exports.Animation = Animation exports.Animation = Animation

0 comments on commit cda5559

Please sign in to comment.