diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-12 11:32:41 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-12 11:32:41 -0800 |
| commit | 069dd07a1732c6a752773aaed9e8c18ab472375f (patch) | |
| tree | d7baaaa8d60ce09ad9d94fe4653ebae62c6bc250 /deps/npm/html/doc/api/npm-submodule.html | |
| parent | 4d5489667cb073ec9d82ef292ecd0749de494238 (diff) | |
| parent | 1d5e7974451b04cd10afa29ca86641ad5cf68f46 (diff) | |
| download | node-069dd07a1732c6a752773aaed9e8c18ab472375f.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/.mailmap
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/unix/darwin.c
deps/uv/src/unix/udp.c
deps/uv/src/version.c
deps/uv/test/test-list.h
src/node_version.h
Diffstat (limited to 'deps/npm/html/doc/api/npm-submodule.html')
| -rw-r--r-- | deps/npm/html/doc/api/npm-submodule.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/html/doc/api/npm-submodule.html b/deps/npm/html/doc/api/npm-submodule.html index 677b31990..416f20225 100644 --- a/deps/npm/html/doc/api/npm-submodule.html +++ b/deps/npm/html/doc/api/npm-submodule.html @@ -33,7 +33,7 @@ dependencies into the submodule folder.</p> <ul><li>npm help json</li><li>git help submodule</li></ul> </div> -<p id="footer">npm-submodule — npm@1.3.15</p> +<p id="footer">npm-submodule — npm@1.3.17</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") |