diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-05-01 15:44:47 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-05-01 15:44:47 -0700 |
| commit | 8637a40ea8c2b464c02ccad3ae42a66965b1b3f3 (patch) | |
| tree | 3f9f7132f144ad7ca26bafe49adb417c42eb89e0 /AUTHORS | |
| parent | b19b60a05c30fa4108c37ddfcabb9313655af652 (diff) | |
| parent | 1285008fcaa4edc2f810577b42a37cf96696cdf4 (diff) | |
| download | android-node-v8-8637a40ea8c2b464c02ccad3ae42a66965b1b3f3.tar.gz android-node-v8-8637a40ea8c2b464c02ccad3ae42a66965b1b3f3.tar.bz2 android-node-v8-8637a40ea8c2b464c02ccad3ae42a66965b1b3f3.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -538,3 +538,6 @@ Saúl Ibarra Corretgé <saghul@gmail.com> Greg Brail <greg@apigee.com> Shuhei Kagawa <shuhei.kagawa@gmail.com> Yuriy Nemtsov <nemtsov@gmail.com> +Josh Dague <daguej@email.uc.edu> +Goh Yisheng (Andrew) <mail.yisheng@gmail.com> +William Bert <william@spanishdict.com> |