summaryrefslogtreecommitdiff
path: root/deps/npm/man/man1/npm.1
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-01-22 08:42:05 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-01-22 08:42:05 -0800
commitfdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch)
tree0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/man/man1/npm.1
parent6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff)
parent25f9e92813eda927c3d3eaa56dab3a397afadebe (diff)
downloadnode-merge-test.tar.gz
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts: node.gyp
Diffstat (limited to 'deps/npm/man/man1/npm.1')
-rw-r--r--deps/npm/man/man1/npm.12
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 2114ecea9..7f803180c 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -14,7 +14,7 @@ npm <command> [args]
.fi
.
.SH "VERSION"
-1.3.23
+1.3.24
.
.SH "DESCRIPTION"
npm is the package manager for the Node JavaScript platform\. It puts