Permalink
Browse files

Merge branch 'master' of github.com:kamicane/moofx

Conflicts:
	moofx.js
  • Loading branch information...
2 parents 9326ec4 + 799f661 commit c2032d078f329f473309c795fafb2da6b76a3b49 @kamicane committed Jul 22, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/main.js
  2. +1 −1 package.json
View
@@ -12,7 +12,7 @@ var moofx = (typeof document !== "undefined") ? require("./browser") : require("
// attach properties
-moofx.version = "3.0.10-dev"
+moofx.version = "3.0.11-dev"
moofx.requestFrame = function(callback){
frame.request(callback)
View
@@ -1,7 +1,7 @@
{
"name": "moofx",
"description": "A CSS3-enabled javascript animation library for node and the browser",
- "version": "3.0.10",
+ "version": "3.0.11-dev",
"license": "MIT (http://mootools.net/license.txt)",
"main": "./lib/main.js",
"keywords": [

0 comments on commit c2032d0

Please sign in to comment.