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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9cfc929 4fdb8ac)

author	Ben Noordhuis <info@bnoordhuis.nl>
	Mon, 29 Apr 2013 12:08:51 +0000 (14:08 +0200)
committer	Ben Noordhuis <info@bnoordhuis.nl>
	Mon, 29 Apr 2013 12:08:51 +0000 (14:08 +0200)
commit	af1ed99ce2d209e33a7c2aaedaff041fb1b5e8ad
tree	7ce31d561a7b47d42c31ebc159983c6c82566ddd	tree \| snapshot
parent	9cfc92979b6296e431769f5569c5a979bf217e73	commit \| diff
parent	4fdb8acdaef4c3cb1d855e992ada0e63fee520a6	commit \| diff

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

Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/src/version.c
lib/http.js
src/node_crypto.cc
src/node_os.cc
src/node_version.h
test/simple/helper-debugger-repl.js

AUTHORS	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
deps/openssl/asm/Makefile	diff1 \|	diff2 \|	blob \| history
doc/api/events.markdown	diff1 \|	diff2 \|	blob \| history
lib/crypto.js	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
src/node_os.cc	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;