0
0
mirror of https://github.com/nodejs/node.git synced 2024-12-01 16:10:02 +01:00
nodejs/deps
Timothy J Fontaine b19b60a05c Merge remote-tracking branch 'upstream/v0.10'
Reverted 9520adeb37

Conflicts:
	deps/cares/src/ares_parse_txt_reply.c
	deps/uv/.mailmap
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/include/uv.h
	deps/uv/src/unix/error.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	deps/uv/src/win/pipe.c
	deps/uv/src/win/signal.c
	deps/uv/src/win/util.c
	deps/uv/test/test-spawn.c
	deps/uv/vcbuild.bat
	deps/v8/src/platform-posix.cc
	deps/v8/tools/gyp/v8.gyp
	lib/util.js
	src/node.cc
	test/simple/test-util-format.js
	test/simple/test-util.js
2014-05-01 13:54:23 -07:00
..
cares deps: provide TXT chunk info in c-ares 2014-04-24 10:40:35 +04:00
http_parser deps: update http_parser to 2.2.1 2014-01-29 03:23:52 +04:00
mdb_v8 mdb_v8: update to latest version 2014-03-10 19:12:14 -07:00
npm Merge remote-tracking branch 'upstream/v0.10' 2014-05-01 13:54:23 -07:00
openssl openssl: fix keypress requirement in apps on win32 2014-04-08 08:56:52 +04:00
uv uv: update to v0.10.27 2014-05-01 09:27:39 -07:00
v8 deps: fix v8 link error with glibc < 2.17 2014-04-28 19:34:07 +04:00
zlib