Permalink
Browse files

Merge branch 'master' of https://github.com/caolan/async

Pull from upstream. Remake the min.js file.

Conflicts:
	dist/async.min.js
  • Loading branch information...
allanca committed Aug 2, 2011
2 parents 010c3a5 + f3aec61 commit 9e116c4c76d13ffecec716e6bfee410592c01827
Showing with 2 additions and 2 deletions.
  1. +1 −1 dist/async.min.js
  2. +1 −1 lib/async.js
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -564,7 +564,7 @@
},
process: function () {
if (workers < q.concurrency && tasks.length) {
var task = tasks.splice(0, 1)[0];
var task = tasks.shift();
if(q.empty && tasks.length == 0) q.empty();
workers += 1;
worker(task.data, function () {

0 comments on commit 9e116c4

Please sign in to comment.