Timothy J Fontaine 48c542db52 Merge remote-tracking branch 'upstream/v0.10' ... Conflicts: AUTHORS ChangeLog deps/npm/Makefile deps/npm/doc/api/npm-commands.md deps/npm/doc/api/npm-deprecate.md deps/npm/doc/api/npm-init.md deps/npm/doc/api/npm-owner.md deps/npm/doc/api/npm-publish.md deps/npm/doc/api/npm-run-script.md deps/npm/doc/cli/npm-adduser.md deps/npm/doc/cli/npm-bin.md deps/npm/doc/cli/npm-bugs.md deps/npm/doc/cli/npm-build.md deps/npm/doc/cli/npm-cache.md deps/npm/doc/cli/npm-completion.md deps/npm/doc/cli/npm-deprecate.md deps/npm/doc/cli/npm-docs.md deps/npm/doc/cli/npm-edit.md deps/npm/doc/cli/npm-explore.md deps/npm/doc/cli/npm-help-search.md deps/npm/doc/cli/npm-help.md deps/npm/doc/cli/npm-init.md deps/npm/doc/cli/npm-install.md deps/npm/doc/cli/npm-link.md deps/npm/doc/cli/npm-ls.md deps/npm/doc/cli/npm-outdated.md deps/npm/doc/cli/npm-owner.md deps/npm/doc/cli/npm-pack.md deps/npm/doc/cli/npm-prefix.md deps/npm/doc/cli/npm-prune.md deps/npm/doc/cli/npm-publish.md deps/npm/doc/cli/npm-restart.md deps/npm/doc/cli/npm-rm.md deps/npm/doc/cli/npm-root.md deps/npm/doc/cli/npm-run-script.md deps/npm/doc/cli/npm-search.md deps/npm/doc/cli/npm-shrinkwrap.md deps/npm/doc/cli/npm-start.md deps/npm/doc/cli/npm-stop.md deps/npm/doc/cli/npm-submodule.md deps/npm/doc/cli/npm-tag.md deps/npm/doc/cli/npm-test.md deps/npm/doc/cli/npm-uninstall.md deps/npm/doc/cli/npm-unpublish.md deps/npm/doc/cli/npm-update.md deps/npm/doc/cli/npm-version.md deps/npm/doc/cli/npm-view.md deps/npm/doc/cli/npm-whoami.md deps/npm/doc/files/npm-folders.md deps/npm/doc/files/package.json.md deps/npm/doc/misc/npm-coding-style.md deps/npm/doc/misc/npm-config.md deps/npm/doc/misc/npm-developers.md deps/npm/doc/misc/npm-disputes.md deps/npm/doc/misc/npm-faq.md deps/npm/doc/misc/npm-registry.md deps/npm/doc/misc/npm-scripts.md deps/npm/doc/misc/semver.md deps/npm/html/doc/README.html deps/npm/html/doc/api/npm-bin.html deps/npm/html/doc/api/npm-bugs.html deps/npm/html/doc/api/npm-commands.html deps/npm/html/doc/api/npm-config.html deps/npm/html/doc/api/npm-deprecate.html deps/npm/html/doc/api/npm-docs.html deps/npm/html/doc/api/npm-edit.html deps/npm/html/doc/api/npm-explore.html deps/npm/html/doc/api/npm-help-search.html deps/npm/html/doc/api/npm-init.html deps/npm/html/doc/api/npm-install.html deps/npm/html/doc/api/npm-link.html deps/npm/html/doc/api/npm-load.html deps/npm/html/doc/api/npm-ls.html deps/npm/html/doc/api/npm-outdated.html deps/npm/html/doc/api/npm-owner.html deps/npm/html/doc/api/npm-pack.html deps/npm/html/doc/api/npm-prefix.html deps/npm/html/doc/api/npm-prune.html deps/npm/html/doc/api/npm-publish.html deps/npm/html/doc/api/npm-rebuild.html deps/npm/html/doc/api/npm-restart.html deps/npm/html/doc/api/npm-root.html deps/npm/html/doc/api/npm-run-script.html deps/npm/html/doc/api/npm-search.html deps/npm/html/doc/api/npm-shrinkwrap.html deps/npm/html/doc/api/npm-start.html deps/npm/html/doc/api/npm-stop.html deps/npm/html/doc/api/npm-submodule.html deps/npm/html/doc/api/npm-tag.html deps/npm/html/doc/api/npm-test.html deps/npm/html/doc/api/npm-uninstall.html deps/npm/html/doc/api/npm-unpublish.html deps/npm/html/doc/api/npm-update.html deps/npm/html/doc/api/npm-version.html deps/npm/html/doc/api/npm-view.html deps/npm/html/doc/api/npm-whoami.html deps/npm/html/doc/api/npm.html deps/npm/html/doc/cli/npm-adduser.html deps/npm/html/doc/cli/npm-bin.html deps/npm/html/doc/cli/npm-bugs.html deps/npm/html/doc/cli/npm-build.html deps/npm/html/doc/cli/npm-bundle.html deps/npm/html/doc/cli/npm-cache.html deps/npm/html/doc/cli/npm-completion.html deps/npm/html/doc/cli/npm-config.html deps/npm/html/doc/cli/npm-dedupe.html deps/npm/html/doc/cli/npm-deprecate.html deps/npm/html/doc/cli/npm-docs.html deps/npm/html/doc/cli/npm-edit.html deps/npm/html/doc/cli/npm-explore.html deps/npm/html/doc/cli/npm-help-search.html deps/npm/html/doc/cli/npm-help.html deps/npm/html/doc/cli/npm-init.html deps/npm/html/doc/cli/npm-install.html deps/npm/html/doc/cli/npm-link.html deps/npm/html/doc/cli/npm-ls.html deps/npm/html/doc/cli/npm-outdated.html deps/npm/html/doc/cli/npm-owner.html deps/npm/html/doc/cli/npm-pack.html deps/npm/html/doc/cli/npm-prefix.html deps/npm/html/doc/cli/npm-prune.html deps/npm/html/doc/cli/npm-publish.html deps/npm/html/doc/cli/npm-rebuild.html deps/npm/html/doc/cli/npm-restart.html deps/npm/html/doc/cli/npm-rm.html deps/npm/html/doc/cli/npm-root.html deps/npm/html/doc/cli/npm-run-script.html deps/npm/html/doc/cli/npm-search.html deps/npm/html/doc/cli/npm-shrinkwrap.html deps/npm/html/doc/cli/npm-star.html deps/npm/html/doc/cli/npm-stars.html deps/npm/html/doc/cli/npm-start.html deps/npm/html/doc/cli/npm-stop.html deps/npm/html/doc/cli/npm-submodule.html deps/npm/html/doc/cli/npm-tag.html deps/npm/html/doc/cli/npm-test.html deps/npm/html/doc/cli/npm-uninstall.html deps/npm/html/doc/cli/npm-unpublish.html deps/npm/html/doc/cli/npm-update.html deps/npm/html/doc/cli/npm-version.html deps/npm/html/doc/cli/npm-view.html deps/npm/html/doc/cli/npm-whoami.html deps/npm/html/doc/cli/npm.html deps/npm/html/doc/files/npm-folders.html deps/npm/html/doc/files/npm-global.html deps/npm/html/doc/files/npm-json.html deps/npm/html/doc/files/npmrc.html deps/npm/html/doc/files/package.json.html deps/npm/html/doc/index.html deps/npm/html/doc/misc/npm-coding-style.html deps/npm/html/doc/misc/npm-config.html deps/npm/html/doc/misc/npm-developers.html deps/npm/html/doc/misc/npm-disputes.html deps/npm/html/doc/misc/npm-faq.html deps/npm/html/doc/misc/npm-index.html deps/npm/html/doc/misc/npm-registry.html deps/npm/html/doc/misc/npm-scripts.html deps/npm/html/doc/misc/removing-npm.html deps/npm/html/doc/misc/semver.html deps/npm/man/man1/npm-README.1 deps/npm/man/man1/npm-adduser.1 deps/npm/man/man1/npm-bin.1 deps/npm/man/man1/npm-bugs.1 deps/npm/man/man1/npm-build.1 deps/npm/man/man1/npm-bundle.1 deps/npm/man/man1/npm-cache.1 deps/npm/man/man1/npm-completion.1 deps/npm/man/man1/npm-dedupe.1 deps/npm/man/man1/npm-deprecate.1 deps/npm/man/man1/npm-docs.1 deps/npm/man/man1/npm-edit.1 deps/npm/man/man1/npm-explore.1 deps/npm/man/man1/npm-help-search.1 deps/npm/man/man1/npm-help.1 deps/npm/man/man1/npm-init.1 deps/npm/man/man1/npm-install.1 deps/npm/man/man1/npm-link.1 deps/npm/man/man1/npm-ls.1 deps/npm/man/man1/npm-outdated.1 deps/npm/man/man1/npm-owner.1 deps/npm/man/man1/npm-pack.1 deps/npm/man/man1/npm-prefix.1 deps/npm/man/man1/npm-prune.1 deps/npm/man/man1/npm-publish.1 deps/npm/man/man1/npm-rebuild.1 deps/npm/man/man1/npm-restart.1 deps/npm/man/man1/npm-rm.1 deps/npm/man/man1/npm-root.1 deps/npm/man/man1/npm-run-script.1 deps/npm/man/man1/npm-search.1 deps/npm/man/man1/npm-shrinkwrap.1 deps/npm/man/man1/npm-star.1 deps/npm/man/man1/npm-stars.1 deps/npm/man/man1/npm-start.1 deps/npm/man/man1/npm-stop.1 deps/npm/man/man1/npm-submodule.1 deps/npm/man/man1/npm-tag.1 deps/npm/man/man1/npm-test.1 deps/npm/man/man1/npm-uninstall.1 deps/npm/man/man1/npm-unpublish.1 deps/npm/man/man1/npm-update.1 deps/npm/man/man1/npm-version.1 deps/npm/man/man1/npm-view.1 deps/npm/man/man1/npm-whoami.1 deps/npm/man/man1/npm.1 deps/npm/man/man3/npm-bin.3 deps/npm/man/man3/npm-bugs.3 deps/npm/man/man3/npm-commands.3 deps/npm/man/man3/npm-config.3 deps/npm/man/man3/npm-deprecate.3 deps/npm/man/man3/npm-docs.3 deps/npm/man/man3/npm-edit.3 deps/npm/man/man3/npm-explore.3 deps/npm/man/man3/npm-help-search.3 deps/npm/man/man3/npm-init.3 deps/npm/man/man3/npm-install.3 deps/npm/man/man3/npm-link.3 deps/npm/man/man3/npm-load.3 deps/npm/man/man3/npm-ls.3 deps/npm/man/man3/npm-outdated.3 deps/npm/man/man3/npm-owner.3 deps/npm/man/man3/npm-pack.3 deps/npm/man/man3/npm-prefix.3 deps/npm/man/man3/npm-prune.3 deps/npm/man/man3/npm-publish.3 deps/npm/man/man3/npm-rebuild.3 deps/npm/man/man3/npm-restart.3 deps/npm/man/man3/npm-root.3 deps/npm/man/man3/npm-run-script.3 deps/npm/man/man3/npm-search.3 deps/npm/man/man3/npm-shrinkwrap.3 deps/npm/man/man3/npm-start.3 deps/npm/man/man3/npm-stop.3 deps/npm/man/man3/npm-submodule.3 deps/npm/man/man3/npm-tag.3 deps/npm/man/man3/npm-test.3 deps/npm/man/man3/npm-uninstall.3 deps/npm/man/man3/npm-unpublish.3 deps/npm/man/man3/npm-update.3 deps/npm/man/man3/npm-version.3 deps/npm/man/man3/npm-view.3 deps/npm/man/man3/npm-whoami.3 deps/npm/man/man3/npm.3 deps/npm/man/man5/npm-folders.5 deps/npm/man/man5/npm-global.5 deps/npm/man/man5/npm-json.5 deps/npm/man/man7/npm-coding-style.7 deps/npm/man/man7/npm-config.7 deps/npm/man/man7/npm-developers.7 deps/npm/man/man7/npm-disputes.7 deps/npm/man/man7/npm-faq.7 deps/npm/man/man7/npm-registry.7 deps/npm/man/man7/npm-scripts.7 deps/npm/man/man7/removing-npm.7 deps/npm/man/man7/semver.7 deps/npm/package.json deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/src/version.c deps/uv/test/test-fs.c deps/uv/test/test-list.h lib/http.js lib/tls.js src/node_version.h		2013-07-12 13:26:56 -07:00
..
cares	deps: upgrade c-ares to piscisaureus/cares@805d153	2013-07-06 22:20:29 +02:00
http_parser	deps: upgrade http_parser to ad3b631	2012-08-30 00:06:47 +02:00
npm	Merge remote-tracking branch 'upstream/v0.10'	2013-07-12 13:26:56 -07:00
openssl	openssl: add missing configuration pieces for MIPS	2013-06-13 13:27:58 +02:00
uv	Merge remote-tracking branch 'upstream/v0.10'	2013-07-12 13:26:56 -07:00
v8	v8: reapply floating patches	2013-07-06 16:53:06 +02:00
zlib	zlib: compile without -ansi	2011-10-28 17:31:40 +02:00