Revision ae40f1c4
| ID | ae40f1c438050bf4607143862259ae10931e3a3c |
| Parent | d68c02e3, 33a5c8a8 |
| Child | 5a005670 |
Merge remote-tracking branch 'ry/v0.8' into v0.8-merge
Conflicts:
AUTHORS
ChangeLog
deps/openssl/openssl.gyp
deps/uv/src/unix/linux/linux-core.c
deps/uv/src/unix/process.c
deps/uv/src/unix/stream.c
deps/v8/src/arm/builtins-arm.cc
deps/v8/src/arm/code-stubs-arm.cc
deps/v8/src/arm/full-codegen-arm.cc
lib/tls.js
src/node_version.h
test/simple/test-http-client-timeout-agent.js
Files
- added
- modified
- copied
- renamed
- deleted