Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

2014-02-13 15:46:42 +00:00 · 2014-02-13 15:46:42 +00:00 · abceb5cb71
commit abceb5cb71
parent f8a6285f7f 86e3e0a003
1 changed files with 2 additions and 2 deletions
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@ -57,8 +57,8 @@ module.exports = function(config) {
        browsers : ['Firefox'],

        // If browser does not capture in given timeout [ms], kill it
-        // CLI --capture-timeout 5000
-        captureTimeout : 5000,
+        // CLI --capture-timeout 60000
+        captureTimeout : 60000,

        // Auto run tests on start (when browsers are captured) and exit
        // CLI --single-run --no-single-run