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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f83afd3 8ee4300)

author	Fedor Indutny <fedor.indutny@gmail.com>
	Fri, 12 Apr 2013 15:30:11 +0000 (11:30 -0400)
committer	Fedor Indutny <fedor.indutny@gmail.com>
	Fri, 12 Apr 2013 15:30:11 +0000 (11:30 -0400)
commit	259839fe75dde67472b815d05637750360fd76bf
tree	0ac2a31410fd7bc53bcd7ddecb0d52c60dd2b2f0	tree \| snapshot
parent	f83afd3c74865182bce62843fe23d28b4f876638	commit \| diff
parent	8ee43006b81b713db1a0ca190f5332edd45121c1	commit \| diff

Merge branch 'v0.10'

Conflicts:
ChangeLog
deps/uv/src/version.c
src/node.h
src/node_crypto.cc
src/node_crypto_bio.cc
src/node_crypto_bio.h
src/node_object_wrap.h
src/node_version.h

13 files changed:

AUTHORS	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/api/fs.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/process.markdown	diff1 \|	diff2 \|	blob \| history
lib/buffer.js	diff1 \|	diff2 \|	blob \| history
lib/crypto.js	diff1 \|	diff2 \|	blob \| history
lib/tls.js	diff1 \|	diff2 \|	blob \| history
src/node.cc	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
src/node_crypto.h	diff1 \|	diff2 \|	blob \| history
src/node_object_wrap.h	diff1 \|	diff2 \|	blob \| history
src/node_version.h	diff1 \|	diff2 \|	blob \| history
test/simple/test-buffer.js	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;