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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0c1e7b5 d879042)

author	Ben Noordhuis <info@bnoordhuis.nl>
	Thu, 28 Feb 2013 15:58:24 +0000 (16:58 +0100)
committer	Ben Noordhuis <info@bnoordhuis.nl>
	Thu, 28 Feb 2013 15:58:24 +0000 (16:58 +0100)
commit	cb87920ba9c2871630ff37af6f0131fb1968dc95
tree	d5e6e18f7b4cdfd184bb18be417b137ff3ad8538	tree \| snapshot
parent	0c1e7b53d0a33e112107f5387fbde9b2d688fb52	commit \| diff
parent	d87904286024f5ceb6a2d0d5f17e919c775830a0	commit \| diff

Merge remote-tracking branch 'origin/v0.8'

Conflicts:
AUTHORS
ChangeLog
deps/uv/src/unix/pipe.c
lib/http.js
src/node_version.h

AUTHORS	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
common.gypi	diff1 \|	diff2 \|	blob \| history
doc/api/child_process.markdown	diff1 \|	diff2 \|	blob \| history
lib/http.js	diff1 \|	diff2 \|	blob \| history
src/node_zlib.cc	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;