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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2433eeb 6c0c00a)

author	Fedor Indutny <fedor.indutny@gmail.com>
	Mon, 23 Jan 2012 18:30:28 +0000 (00:30 +0600)
committer	Fedor Indutny <fedor.indutny@gmail.com>
	Mon, 23 Jan 2012 18:30:28 +0000 (00:30 +0600)
commit	667aae596cded9336f50574386683ec39ada43f2
tree	41918ad8d4801cc34215b054cb63dc83bd1ce8a5	tree \| snapshot
parent	2433eeb3850a91feb99bab530cb7183800166390	commit \| diff
parent	6c0c00a2052ec613503a0322dcbabb6fcf41dab0	commit \| diff

Merge branch 'v0.6'

Conflicts:
ChangeLog
doc/template.html
lib/cluster.js
lib/http.js
lib/tls.js
src/node.h
src/node_version.h
test/simple/test-cluster-kill-workers.js

15 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
lib/child_process.js	diff1 \|	diff2 \|	blob \| history
lib/http.js	diff1 \|	diff2 \|	blob \| history
lib/path.js	diff1 \|	diff2 \|	blob \| history
lib/tls.js	diff1 \|	diff2 \|	blob \| history
lib/util.js	diff1 \|	diff2 \|	blob \| history
lib/zlib.js	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
src/udp_wrap.cc	diff1 \|	diff2 \|	blob \| history
src/v8_typed_array.cc	diff1 \|	diff2 \|	blob \| history
test/simple/test-assert.js	diff1 \|	diff2 \|	blob \| history
test/simple/test-child-process-fork2.js	diff1 \|	diff2 \|	blob \| history
test/simple/test-fs-mkdir.js	diff1 \|	diff2 \|	blob \| history
test/simple/test-path.js	diff1 \|	diff2 \|	blob \| history
test/simple/test-tls-passphrase.js	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;