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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dc9acd4 6327d67)

author	Ben Noordhuis <info@bnoordhuis.nl>
	Tue, 30 Jul 2013 13:19:48 +0000 (15:19 +0200)
committer	Ben Noordhuis <info@bnoordhuis.nl>
	Tue, 30 Jul 2013 13:19:48 +0000 (15:19 +0200)
commit	b8c04b921b626edd4201f805d0feb384c8e91ea7
tree	3266e137f154fccf8b8f33ff4904f8aa0e8e8e25	tree \| snapshot
parent	dc9acd4faeba1aade414bdd8da28f30b16773575	commit \| diff
parent	6327d67be3a939b1ce6ac8541504b1f6fc338fd9	commit \| diff

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

Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/src/version.c
deps/uv/src/win/fs.c
src/node.cc
src/node_crypto.cc
src/node_os.cc
src/node_version.h

AUTHORS	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/api/events.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/fs.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/tls.markdown	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
src/node_file.cc	diff1 \|	diff2 \|	blob \| history
src/node_os.cc	diff1 \|	diff2 \|	blob \| history
src/string_bytes.cc	diff1 \|	diff2 \|	blob \| history
test/simple/test-crypto.js	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;