diff options
| author | isaacs <i@izs.me> | 2013-05-20 14:43:14 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-05-20 14:43:14 -0700 |
| commit | 0fefcc1690f65593aba768b78e1b97b925f8caad (patch) | |
| tree | d3ac88f3ebb9dabe66a4a7fc02d7b70bf54c75a2 /AUTHORS | |
| parent | d820b6441211ce79ed09ee3ef3992bc48e78bd93 (diff) | |
| parent | 3a2b5030ae1cd200e92eaf3928bd20a8deda50c6 (diff) | |
| download | android-node-v8-0fefcc1690f65593aba768b78e1b97b925f8caad.tar.gz android-node-v8-0fefcc1690f65593aba768b78e1b97b925f8caad.tar.bz2 android-node-v8-0fefcc1690f65593aba768b78e1b97b925f8caad.zip | |
Merge remote-tracking branch ry/v0.10 into master
Conflicts:
AUTHORS
ChangeLog
src/node_crypto.cc
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -452,4 +452,6 @@ Kevin Locke <kevin@kevinlocke.name> Daniel Moore <polaris@northhorizon.net> Robert Kowalski <rok@kowalski.gd> Benoit Vallée <github@benoitvallee.net> +Ryuichi Okumura <okuryu@okuryu.com> +Brandon Frohs <bfrohs@gmail.com> Nick Sullivan <nick@sullivanflock.com> |