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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 640912d 9975ff6)

author	Timothy J Fontaine <tjfontaine@gmail.com>
	Sat, 25 Jan 2014 03:13:50 +0000 (19:13 -0800)
committer	Timothy J Fontaine <tjfontaine@gmail.com>
	Sat, 25 Jan 2014 03:13:50 +0000 (19:13 -0800)
commit	c1b1f312035644fd33cbc59cacd7980e7ed432da
tree	789d6f0b74c158d9d95414d09dbe7c6c08bd115d	tree \| snapshot
parent	640912d18a63704fd493059a72b19e6367c2fc1c	commit \| diff
parent	9975ff603b5ba0e5f4b2f0ffb07474a9013dab36	commit \| diff

Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/unix/process.c
deps/uv/src/version.c
lib/net.js
node.gyp
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
doc/api/process.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/readline.markdown	diff1 \|	diff2 \|	blob \| history
lib/child_process.js	diff1 \|	diff2 \|	blob \| history
node.gyp	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;