Merge branch 'karma-fix' of github.com:drkibitz/pixi.js into drkibitz-karma-fix
commit 1ed43e1dfdcc79990d7bb2e9fa986539c4240514
2 parents 9da5605 + 7ac9872
@Chad Engler Chad Engler authored on 12 Jan 2014
Showing 4 changed files
View
Gruntfile.js
View
package.json
View
tasks/karma.js
View
test/karma.conf.js