[Pkg-javascript-commits] [node-async] 134/480: Merge branch 'issue-88' of https://github.com/ixti/async

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository node-async.

commit 785349f5cc8d2ba16e66719a7b44cdb575da49f5
Merge: a472964 912d36b
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date:   Sun Feb 12 17:21:07 2012 -0800

    Merge branch 'issue-88' of https://github.com/ixti/async
    
    Conflicts:
    	test/test-async.js

 test/test-async.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --cc test/test-async.js
index 887e17c,4370408..a020251
--- a/test/test-async.js
+++ b/test/test-async.js
@@@ -1072,7 -1072,8 +1072,9 @@@ exports['noConflict - node only'] = fun
          var filename = __dirname + '/../lib/async.js';
          fs.readFile(filename, function(err, content){
              if(err) return test.done();
-             var Script = process.binding('evals').NodeScript;
++
+             // Script -> NodeScript in node v0.6.x
+             var Script = process.binding('evals').Script || process.binding('evals').NodeScript;
  
              var s = new Script(content, filename);
              var s2 = new Script(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-async.git