diff options
| author | isaacs <i@izs.me> | 2012-09-28 20:47:48 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-09-28 20:47:48 +0400 |
| commit | ae40f1c438050bf4607143862259ae10931e3a3c (patch) | |
| tree | 0e90ed620fd8dd2eab01388eacbfae1615359553 /AUTHORS | |
| parent | d68c02e3fe50405279a138e908701558939ce926 (diff) | |
| parent | 33a5c8a814483ff48ba3acd94e091335b3536870 (diff) | |
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
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -365,3 +365,5 @@ Atsuya Takagi <atsuya.takagi@gmail.com> Pooya Karimian <pkarimian@sencha.com> Frédéric Germain <frederic.germain@gmail.com> Kazuyuki Yamada <tasogare.pg@gmail.com> +Robin Lee <cheeselee@fedoraproject.org> +Adam Blackburn <regality@gmail.com> |