Merge #302 from @drkibitz, and fix conflicts

This commit is contained in:
Chad Engler 2013-12-08 08:44:50 -08:00
commit a60de480ff
98 changed files with 1830 additions and 2612 deletions

View file

@ -18,16 +18,22 @@
"main": "bin/pixi.js",
"scripts": {
"test": "grunt travis --verbose"
},
"dependencies": {},
"devDependencies": {
"grunt": "~0.4.x",
"grunt-contrib-jshint": "0.3.x",
"grunt-contrib-jshint": "0.6.x",
"grunt-contrib-uglify": "0.2.x",
"grunt-contrib-connect": "0.2.x",
"grunt-contrib-qunit": "0.2.x",
"grunt-contrib-connect": "0.3.x",
"grunt-contrib-yuidoc": "0.4.x",
"grunt-contrib-concat": "0.1.x",
"grunt-concat-sourcemap": "0.3.x",
"grunt-contrib-concat": "0.1.x"
"grunt-contrib-concat": "0.3.x",
"chai": "~1.7.0",
"karma": "0.11.0",
"karma-firefox-launcher": "0.1.0",
"karma-mocha": "0.1.0"
}
}