Merge branch 'testing' into release

craftyjs · Dec 6, 2013 · ef0823e · ef0823e
2 parents 95178b5 + dfc6008
commit ef0823e
Show file tree

Hide file tree

Showing 6 changed files with 12,590 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-crafty.js
-crafty-min.js
+/crafty.js
+/crafty-min.js
 build/api/*
 .*.sw?
 .DS_store

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "crafty",
   "main": "crafty.js",
-  "version": "0.6",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/craftyjs/Crafty.git"

diff --git a/dist/crafty-min.js b/dist/crafty-min.js