diff options
| author | isaacs <i@izs.me> | 2013-05-17 13:04:02 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-05-17 14:04:54 -0700 |
| commit | 61c9f78c639459f28eea3d1de203b92debd9f513 (patch) | |
| tree | 72e6860c814a59075d8d61c0e8fff458db7925e0 /AUTHORS | |
| parent | 79988438078f58f828811ec87394700ccef42293 (diff) | |
| parent | f59ab10a6415e7dce7a6c3b6e734c213298ec205 (diff) | |
| download | nodejs-61c9f78c639459f28eea3d1de203b92debd9f513.tar.gz nodejs-61c9f78c639459f28eea3d1de203b92debd9f513.tar.bz2 nodejs-61c9f78c639459f28eea3d1de203b92debd9f513.zip | |
Merge remote-tracking branch 'ry/v0.10' into master
Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/config-unix.mk
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/uv/uv.gyp
src/node.cc
src/node_buffer.cc
src/node_crypto.cc
src/node_version.h
src/stream_wrap.cc
src/stream_wrap.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -451,4 +451,5 @@ Sam Roberts <vieuxtech@gmail.com> Kevin Locke <kevin@kevinlocke.name> Daniel Moore <polaris@northhorizon.net> Robert Kowalski <rok@kowalski.gd> +Benoit Vallée <github@benoitvallee.net> Nick Sullivan <nick@sullivanflock.com> |