daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,450 Commits
50 Branches
862 Tags
1.9 GiB
Commit Graph

177 Commits (e9adb7fbbc43035f960b1be99bacd7a7aec6bf83)

Author SHA1 Message Date
isaacs 116835561d Merge remote-tracking branch 'ry/v0.6' 
Conflicts:
	ChangeLog
	deps/v8/src/version.cc
	deps/v8/tools/gyp/v8.gyp
	doc/about/index.html
	doc/community/index.html
	doc/index.html
	doc/logos/index.html
	doc/template.html
	lib/path.js
	lib/querystring.js
	src/node_version.h
 2012-02-06 15:43:21 -08:00
Bert Belder 67cd05472e uv: upgrade to 267e75d 2012-02-02 17:42:08 +01:00
isaacs 18d179c2d8 Merge remote-tracking branch 'ry/v0.6' into master 
Conflicts:
	ChangeLog
	deps/uv/src/unix/udp.c
	deps/uv/src/win/fs.c
	deps/uv/src/win/udp.c
	deps/uv/test/test-fs.c
	doc/index.html
	doc/logos/index.html
	doc/template.html
	src/node_version.h
 2012-01-31 18:18:00 -08:00
Bert Belder fa490f6497 uv: upgrade to 3eb94e9 2012-01-31 17:41:46 +01:00
Igor Zinkovsky ff40253566 upgrade uv to 812e410772 2012-01-30 15:57:08 -08:00
Ben Noordhuis 4b6164ab49 uv: upgrade to 332b72e 2012-01-28 01:30:46 +01:00
Ben Noordhuis 22e23473ea uv: upgrade to 16124bb 2012-01-28 00:17:01 +01:00
Ben Noordhuis 14b7c4327f uv: upgrade to 3de0411 2012-01-27 22:32:02 +01:00
Ben Noordhuis 8a413b076e uv: upgrade to 3f1bad2 2012-01-27 22:18:17 +01:00
Ben Noordhuis 352febe251 uv: upgrade to 9c76d0d 2012-01-27 00:56:32 +01:00
Ben Noordhuis 986e612557 uv: upgrade to b88bc43 2012-01-24 00:11:44 +01:00
Ben Noordhuis 2433eeb385 uv: upgrade to 1cca230 2012-01-23 13:35:36 +01:00
Igor Zinkovsky f5e742b264 upgrade libuv to edbabe6f83 2012-01-23 01:34:05 -08:00
Ben Noordhuis 08ab306afd uv: upgrade to 497b1ec 2012-01-21 03:14:15 +01:00
Igor Zinkovsky 2c1025706b upgrade libuv to 52511b9ddc 2012-01-16 17:24:53 -08:00
Ryan Dahl 7584225873 Upgrade libuv to joyent/libuv@f5bd21f 2012-01-16 15:15:34 -08:00
Fedor Indutny f0c629a36b uv: upgrade to e7758e1 2012-01-16 20:18:37 +06:00
Igor Zinkovsky 247d0da188 update libuv to 855764406e 
fixes #2521
 2012-01-11 19:35:03 -08:00
Ryan Dahl 8b28d599a7 Merge remote branch 'origin/v0.6' 
Conflicts:
	Makefile
	configure
	src/node_version.h
 2012-01-09 11:20:22 -08:00
Ben Noordhuis cc5cea35b0 uv: upgrade to 803f5a0 2012-01-09 15:46:30 +01:00
Ben Noordhuis 075acfa2d6 uv: upgrade to 56a31f0 2012-01-06 00:00:40 +01:00
Ben Noordhuis c123ac05dc Merge remote-tracking branch 'origin/v0.6' 
Conflicts:
	src/udp_wrap.cc
 2012-01-02 12:29:39 +01:00
Ben Noordhuis 41f2725639 uv: upgrade to 38fc6ad 2012-01-02 10:43:10 +01:00
Ben Noordhuis 5427311ae6 uv: upgrade to 0db56ea 2011-12-29 01:43:24 +01:00
Ben Noordhuis 2afd20b542 uv: upgrade to 85f6b79 2011-12-29 00:18:23 +01:00
Ben Noordhuis c481f97a9c uv: upgrade to d6a06b8 2011-12-27 12:54:24 -08:00
Ryan Dahl f7f8af8420 Merge remote branch 'origin/v0.6' 
Conflicts:
	Makefile
	lib/_debugger.js
 2011-12-21 12:17:23 -08:00
Ben Noordhuis b24c515dbf uv: upgrade to 10de090 2011-12-21 16:59:53 +01:00
Ben Noordhuis f322bbe729 uv: upgrade to feb267e 2011-12-18 22:35:08 +01:00
Ryan Dahl 01e4fe5fbc upgrade libuv to cb70db1 2011-12-16 13:35:08 -08:00
Ben Noordhuis 666aa0a343 uv: upgrade to d808cf9 2011-12-16 17:57:56 +01:00
Igor Zinkovsky da3356bb38 upgrade libuv to 8e50b6043da7b3221f51b3158033255c9a210d08 2011-12-15 15:56:42 -08:00
Ryan Dahl ebe0fb697a Merge remote branch 'origin/v0.6' 2011-12-06 17:04:51 -08:00
Ben Noordhuis 57d2857938 uv: upgrade to 0db3274 2011-12-06 22:02:26 +01:00
Ryan Dahl 2003593143 Merge remote branch 'origin/v0.6' 
Conflicts:
	deps/v8/src/debug.cc
	deps/v8/src/version.cc
	src/node_version.h
 2011-12-06 11:50:54 -08:00
Ben Noordhuis a0fdd5f3f6 uv: upgrade to 34e95d1 2011-12-04 13:22:21 +01:00
Ben Noordhuis 49ba55b100 Merge branch 'v0.6' 
Conflicts:
	src/node_version.h
 2011-12-02 16:34:33 +01:00
Igor Zinkovsky dd4b280d8c upgrade libuv to 60630dab0f 2011-12-01 13:56:04 -08:00
Bert Belder ae648a44c4 Upgrade libuv to 9c064fb 2011-12-01 22:50:09 +01:00
Bert Belder 6ed721afd2 Upgrade libuv to fce90652ed38ab0925131ed141972354a494933b 2011-11-29 12:45:39 +01:00
Bert Belder cffd0bb68d Merge branch 'v0.6' 
Conflicts:
	Makefile
	src/node_version.h
	test/simple/test-http-response-no-headers.js
 2011-11-25 12:34:29 +01:00
Bert Belder a056ef1f39 Upgrade libuv to 01f64f6 2011-11-25 10:16:43 +01:00
Igor Zinkovsky 319580953d update libuv to cfa4112950b1f897fda7 2011-11-24 19:45:35 -08:00
Bert Belder 95eb729e6f Upgrade libuv to 3a50f8f 2011-11-25 02:13:37 +01:00
Bert Belder d51a0c353b Upgrade libuv to 45b976a 2011-11-25 01:01:57 +01:00
Bert Belder 7244b9cee8 Upgrade libuv to ea63f06 2011-11-24 19:57:17 +01:00
Ben Noordhuis 3f92031aeb uv: upgrade to 01fbe7b 2011-11-18 21:17:09 +01:00
Ben Noordhuis 1b2d333ee3 uv: upgrade to e4680cc 2011-11-18 13:07:01 +01:00
Ryan Dahl 44314ccf48 Upgrade libuv to 2007eb8 2011-11-16 13:06:10 -08:00
Ben Noordhuis 0757c73a20 uv: upgrade to 224584c 2011-11-10 20:10:54 +01:00