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

projects / platform / upstream / nodejs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 47643d2 4a23add)

author	Nathan Rajlich <nathan@tootallnate.net>
	Sat, 13 Oct 2012 23:16:56 +0000 (16:16 -0700)
committer	Nathan Rajlich <nathan@tootallnate.net>
	Sat, 13 Oct 2012 23:16:56 +0000 (16:16 -0700)
commit	4b238b4c2ae8f5cf409cea5ca214b480b00e1a86
tree	0c403c3a2f0f117bfe7230fc7bfbd197ebf78845	tree \| snapshot
parent	47643d2ec517ceb8f7ce180142262e393c4d8e89	commit \| diff
parent	4a23add90f155e6761d443d1277a31c2a2a4abb2	commit \| diff

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

Conflicts:
AUTHORS
ChangeLog
deps/uv/test/runner-win.c
doc/api/process.markdown
lib/repl.js
src/node_crypto.cc
src/node_version.h

14 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
deps/uv/test/runner-win.c	diff1 \|	diff2 \|	blob \| history
doc/api/crypto.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/http.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/https.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/net.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/process.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/tls.markdown	diff1 \|	diff2 \|	blob \| history
doc/api/util.markdown	diff1 \|	diff2 \|	blob \| history
lib/repl.js	diff1 \|	diff2 \|	blob \| history
src/node.cc	diff1 \|	diff2 \|	blob \| history
src/node_buffer.cc	diff1 \|	diff2 \|	blob \| history
src/node_crypto.cc	diff1 \|	diff2 \|	blob \| history
test/simple/test-buffer.js	diff1 \|	diff2 \|	blob \| history

Domain: Web Framework / Common;