diff options
| author | isaacs <i@izs.me> | 2013-05-24 17:16:08 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-05-27 14:46:52 -0700 |
| commit | ba048e72b02e17f0c73e0dcb7d37e76a03327c5a (patch) | |
| tree | be9aa3f1f745db25ce2fa12116acf07ac48683cd /AUTHORS | |
| parent | 9c7078cea2b719defbb6519d10a14ab15e733822 (diff) | |
| parent | f904d614bf62d4bbf9c3adffb485f84d5c77c2d8 (diff) | |
| download | android-node-v8-ba048e72b02e17f0c73e0dcb7d37e76a03327c5a.tar.gz android-node-v8-ba048e72b02e17f0c73e0dcb7d37e76a03327c5a.tar.bz2 android-node-v8-ba048e72b02e17f0c73e0dcb7d37e76a03327c5a.zip | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
AUTHORS
ChangeLog
configure
deps/uv/ChangeLog
deps/uv/src/unix/darwin.c
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/v8/src/isolate.cc
deps/v8/src/version.cc
lib/http.js
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -455,3 +455,4 @@ Benoit Vallée <github@benoitvallee.net> Ryuichi Okumura <okuryu@okuryu.com> Brandon Frohs <bfrohs@gmail.com> Nick Sullivan <nick@sullivanflock.com> +Nathan Zadoks <nathan@nathan7.eu> |