Skip to content

Commit eadb4f5

Browse files
tjfontainetjfontaine
committed
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: deps/v8/src/preparser.cc deps/v8/src/win32-math.h doc/api/http.markdown src/node_buffer.h src/node_crypto.cc src/node_file.cc src/node_http_parser.cc
2 parents 4b77bd3 + 5c832e4 commit eadb4f5

226 files changed

Lines changed: 411 additions & 273 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/npm/html/doc/README.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
239239

240240
<ul><li><a href="cli/npm.html">npm(1)</a></li><li><a href="misc/npm-faq.html">npm-faq(7)</a></li><li><a href="cli/npm-help.html">npm-help(1)</a></li><li><a href="misc/npm-index.html">npm-index(7)</a></li></ul>
241241
</div>
242-
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.3.25</p>
242+
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.3.26</p>
243243
<script>
244244
;(function () {
245245
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-bin.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>This function should not be used programmatically. Instead, just refer
2020
to the <code>npm.bin</code> member.</p>
2121
</div>
22-
<p id="footer">npm-bin &mdash; npm@1.3.25</p>
22+
<p id="footer">npm-bin &mdash; npm@1.3.26</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-bugs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">npm-bugs &mdash; npm@1.3.25</p>
28+
<p id="footer">npm-bugs &mdash; npm@1.3.26</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-commands.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2828

2929
<ul><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul>
3030
</div>
31-
<p id="footer">npm-commands &mdash; npm@1.3.25</p>
31+
<p id="footer">npm-commands &mdash; npm@1.3.26</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3333

3434
<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
3535
</div>
36-
<p id="footer">npm-config &mdash; npm@1.3.25</p>
36+
<p id="footer">npm-config &mdash; npm@1.3.26</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-deprecate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3232

3333
<ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
3434
</div>
35-
<p id="footer">npm-deprecate &mdash; npm@1.3.25</p>
35+
<p id="footer">npm-deprecate &mdash; npm@1.3.26</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-docs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">npm-docs &mdash; npm@1.3.25</p>
28+
<p id="footer">npm-docs &mdash; npm@1.3.26</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3030
<p>Since this command opens an editor in a new process, be careful about where
3131
and how this is used.</p>
3232
</div>
33-
<p id="footer">npm-edit &mdash; npm@1.3.25</p>
33+
<p id="footer">npm-edit &mdash; npm@1.3.26</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-explore.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2424

2525
<p>The first element in the &#39;args&#39; parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
2626
</div>
27-
<p id="footer">npm-explore &mdash; npm@1.3.25</p>
27+
<p id="footer">npm-explore &mdash; npm@1.3.26</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

‎deps/npm/html/doc/api/npm-help-search.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232

3333
<p>The silent parameter is not neccessary not used, but it may in the future.</p>
3434
</div>
35-
<p id="footer">npm-help-search &mdash; npm@1.3.25</p>
35+
<p id="footer">npm-help-search &mdash; npm@1.3.26</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)