projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6cf68ae 45cdb0e)
Merge remote-tracking branch 'ry/v0.8' into master
authorisaacs <i@izs.me>
Fri, 14 Dec 2012 00:57:58 +0000 (16:57 -0800)
committerisaacs <i@izs.me>
Fri, 14 Dec 2012 00:57:58 +0000 (16:57 -0800)
commit77ed12fe7a16d3d97d637512db109f4273711bec
treed4b7237231ab810e8dc5906204e5d861efce2773tree | snapshot
parent6cf68aead6886d397772ea176a9f5c35fdb63071commit | diff
parent45cdb0e4c12d8f8e9450174ddd6ddad52a995831commit | diff
Merge remote-tracking branch 'ry/v0.8' into master

Conflicts:
AUTHORS
ChangeLog
deps/uv/test/test-spawn.c
deps/uv/uv.gyp
src/cares_wrap.cc
src/node.cc
src/node_version.h
test/simple/test-buffer.js
tools/gyp/pylib/gyp/common.py
tools/install.py
14 files changed:
AUTHORS diff1 | diff2 | blob | history
ChangeLog diff1 | diff2 | blob | history
doc/api/buffer.markdown diff1 | diff2 | blob | history
doc/api/http.markdown diff1 | diff2 | blob | history
doc/api/https.markdown diff1 | diff2 | blob | history
lib/buffer.js diff1 | diff2 | blob | history
lib/events.js diff1 | diff2 | blob | history
lib/fs.js diff1 | diff2 | blob | history
lib/net.js diff1 | diff2 | blob | history
lib/tls.js diff1 | diff2 | blob | history
test/simple/test-buffer.js diff1 | diff2 | blob | history
test/simple/test-event-emitter-listeners-side-effects.js diff1 | | blob | history
test/simple/test-event-emitter-set-max-listeners-side-effects.js diff1 | | blob | history
tools/install.py diff1 | diff2 | blob | history
Domain: Web Framework / Common;