review.tizen.org Git - platform/upstream/nodejs.git/commit

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 08a91ac cc5cea3)

author	Ryan Dahl <ry@tinyclouds.org>
	Mon, 9 Jan 2012 19:20:22 +0000 (11:20 -0800)
committer	Ryan Dahl <ry@tinyclouds.org>
	Mon, 9 Jan 2012 19:20:22 +0000 (11:20 -0800)
commit	8b28d599a72e717dc00d10f2cc68e64ac6fd5330
tree	2932f7ead998ede43835a00f4b7cf5920e4d4816	tree \| snapshot
parent	08a91acd76cd107dc2f3914f9ea7e277bb85206e	commit \| diff
parent	cc5cea35b0e25352ff40780532d4c5a6bba00359	commit \| diff

Merge remote branch 'origin/v0.6'

Conflicts:
Makefile
configure
src/node_version.h

13 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
deps/uv/src/unix/internal.h	diff1 \|	diff2 \|	blob \| history
doc/api/http.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/net.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/tls.markdown	diff1 \|	diff2 \|	blob \| history
lib/http.js	diff1 \|	diff2 \|	blob \| history
node.gyp	diff1 \|	diff2 \|	blob \| history
src/node.cc	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
src/node_http_parser.cc	diff1 \|	diff2 \|	blob \| history
test/simple/test-http-parser.js	diff1 \|	diff2 \|	blob \| history
test/simple/test-sys.js	diff1 \|	diff2 \|	blob \| history
vcbuild.bat	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;