Permalink
Browse files

Merge branch 'keyframe' of github.com:koenbok/Framer into keyframe

  • Loading branch information...
Koen Bok
Koen Bok committed Mar 22, 2013
2 parents 1018b69 + b5cef35 commit cda555972adfdde0377cc6ccc862b9560fb0c60b
Showing with 6 additions and 6 deletions.
  1. +6 −6 src/animation.coffee
View
@@ -1,12 +1,12 @@
_ = require "underscore"
utils = require "../utils"
css = require "../css"
utils = require "./utils"
css = require "./css"
{EventEmitter} = require "./eventemitter"
{Matrix} = require "../primitives/matrix"
{Matrix} = require "./primitives/matrix"
spring = require "../curves/spring"
bezier = require "../curves/bezier"
spring = require "./curves/spring"
bezier = require "./curves/bezier"
AnimationCounter = 0
@@ -355,4 +355,4 @@ class Animation extends EventEmitter
exports.Animation = Animation
exports.Animation = Animation

0 comments on commit cda5559

Please sign in to comment.