diff options
author | isaacs <i@izs.me> | 2011-09-26 22:06:37 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2011-09-26 22:06:37 +0400 |
commit | 344649dd145ab331a5ff7a2032c100ca62dc1227 (patch) | |
tree | dba228b88dd16dcba8e91d04fbdc231e7d31590d /package.json | |
parent | c3d3b7ee8b3d006acc33f053d808b7a1f5409207 (diff) | |
parent | b3d4ca8606b7b7fdee36e25bd883f4d6db2b3b7f (diff) |
Merge remote branch 'deanlandolt/winbin' into winbin
Conflicts:
lib/utils/mkdir-p.js
lib/utils/output.js
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index c859efaed..59c6e3cc0 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ , "which" ] , "devDependencies" : { "ronn" : "" } , "engines" : { "node" : "0.4 || 0.5", "npm" : "1" } -, "scripts" : { "test" : "./test/run.sh" +, "scripts" : { "test" : "./test/run" , "prepublish" : "make doc" , "dumpconf": "env | grep npm | sort | uniq" } |