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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2f86275 a7dd0e5)

author	Fedor Indutny <fedor@indutny.com>
	Thu, 5 Jun 2014 14:28:39 +0000 (07:28 -0700)
committer	Fedor Indutny <fedor@indutny.com>
	Thu, 5 Jun 2014 14:28:39 +0000 (07:28 -0700)
commit	9920ae67b53283192a7396cad63f6d92b80f1a95
tree	3c89c24c7a7759f9f46ff5e0eacd6c371ef1b562	tree \| snapshot
parent	2f8627528b7fa389793d1be68de3b27ebfbc3748	commit \| diff
parent	a7dd0e51f326dfcc478cc897033e0cd7de62b65d	commit \| diff

Merge branch 'v0.10'

Conflicts:
ChangeLog
lib/events.js
lib/tls.js
src/node_constants.cc
src/node_crypto.cc
src/node_crypto.h
src/node_version.h

ChangeLog	diff1 \|	diff2 \|	blob \| history
common.gypi	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
doc/api/child_process.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/stream.markdown	diff1 \|	diff2 \|	blob \| history
lib/child_process.js	diff1 \|	diff2 \|	blob \| history
lib/events.js	diff1 \|	diff2 \|	blob \| history
src/node_constants.cc	diff1 \|	diff2 \|	blob \| history
test/message/stdin_messages.out	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;