summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2012-08-28 02:54:22 +0200
committerBert Belder <bertbelder@gmail.com>2012-08-28 02:54:22 +0200
commitbf16d9280ea7aadce5c5437184c1d80e651a997a (patch)
tree85c570a9c80181c9bd84ce8bcc726d644daa36db /AUTHORS
parent4822d780bb913c9ef7c2301a181a5834887cddb4 (diff)
parent24184345688e1f545ffc87e5742de06ed9855007 (diff)
downloadandroid-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz
android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.bz2
android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.zip
Merge branch 'v0.8'
Conflicts: ChangeLog deps/openssl/openssl.gyp src/node_version.h
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 429c761add..2b853cacc6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -356,3 +356,4 @@ Eugen Dueck <eugen@dueck.org>
Gil Pedersen <git@gpost.dk>
Tyler Neylon <tylerneylon@gmail.com>
Golo Roden <webmaster@goloroden.de>
+Ron Korving <rkorving@wizcorp.jp>