projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01103d0 f19f980)
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
authorisaacs <i@izs.me>
Tue, 15 May 2012 18:37:34 +0000 (11:37 -0700)
committerisaacs <i@izs.me>
Tue, 15 May 2012 18:37:34 +0000 (11:37 -0700)
commit5164ae38380dadce74e8f64d7bd3eaa1935dd101
treefa29fd7bcac679e69b1e9d7eff299aa38f9288a7tree | snapshot
parent01103d077bce626a332be998813382d15bed3501commit | diff
parentf19f980724fa07347a0d0a9d92e48b267555da5dcommit | diff
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge

Conflicts:
ChangeLog
deps/uv/include/uv-private/uv-unix.h
deps/uv/src/unix/core.c
deps/uv/src/unix/sunos.c
deps/v8/src/runtime.cc
doc/api/crypto.markdown
lib/http.js
src/node_version.h
test/gc/test-http-client-timeout.js
wscript
18 files changed:
ChangeLog diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
doc/api/buffer.markdown diff1 | diff2 | blob | history
doc/api/crypto.markdown diff1 | diff2 | blob | history
doc/api/https.markdown diff1 | diff2 | blob | history
doc/api/stream.markdown diff1 | diff2 | blob | history
doc/api/tls.markdown diff1 | diff2 | blob | history
lib/crypto.js diff1 | diff2 | blob | history
lib/fs.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
src/node.js diff1 | diff2 | blob | history
src/node_crypto.cc diff1 | diff2 | blob | history
src/node_crypto.h diff1 | diff2 | blob | history
src/pipe_wrap.cc diff1 | diff2 | blob | history
test/simple/test-crypto.js diff1 | diff2 | blob | history
test/simple/test-path.js diff1 | diff2 | blob | history
Domain: Web Framework / Common;