diff options
| author | isaacs <i@izs.me> | 2013-06-05 13:38:38 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-06-05 13:38:38 -0700 |
| commit | 0882a7506394e07ae6564ccf3db401b8fb7f7071 (patch) | |
| tree | 0fa2a931b2f7953d06203aa63308de7ac75f602a /deps/npm/man/man1/disputes.1 | |
| parent | a7820a15e7eb4e57a4fe2f076e877dcc6069358c (diff) | |
| parent | e0519ace315c7ce14278d5eaab8d1d72a0a0a054 (diff) | |
| download | node-0882a7506394e07ae6564ccf3db401b8fb7f7071.tar.gz | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/unix/linux-core.c
deps/uv/src/version.c
deps/uv/src/win/timer.c
lib/url.js
src/node_version.h
test/simple/test-url.js
Diffstat (limited to 'deps/npm/man/man1/disputes.1')
| -rw-r--r-- | deps/npm/man/man1/disputes.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/man/man1/disputes.1 b/deps/npm/man/man1/disputes.1 index 0c18035fd..7a7db0034 100644 --- a/deps/npm/man/man1/disputes.1 +++ b/deps/npm/man/man1/disputes.1 @@ -1,7 +1,7 @@ .\" Generated with Ronnjs 0.3.8 .\" http://github.com/kapouer/ronnjs/ . -.TH "NPM\-DISPUTES" "1" "May 2013" "" "" +.TH "NPM\-DISPUTES" "1" "June 2013" "" "" . .SH "NAME" \fBnpm-disputes\fR \-\- Handling Module Name Disputes |