diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
| commit | c1b1f312035644fd33cbc59cacd7980e7ed432da (patch) | |
| tree | 789d6f0b74c158d9d95414d09dbe7c6c08bd115d /AUTHORS | |
| parent | 640912d18a63704fd493059a72b19e6367c2fc1c (diff) | |
| parent | 9975ff603b5ba0e5f4b2f0ffb07474a9013dab36 (diff) | |
| download | android-node-v8-c1b1f312035644fd33cbc59cacd7980e7ed432da.tar.gz android-node-v8-c1b1f312035644fd33cbc59cacd7980e7ed432da.tar.bz2 android-node-v8-c1b1f312035644fd33cbc59cacd7980e7ed432da.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/unix/process.c
deps/uv/src/version.c
lib/net.js
node.gyp
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -514,3 +514,7 @@ Benjamin Waters <benjamin.waters@outlook.com> Lev Gimelfarb <lev.gimelfarb@gmail.com> Peter Flannery <flannery.peter@ntlworld.com> Tuğrul Topuz <tugrultopuz@gmail.com> +ayanamist <contact@ayanamist.com> +Lorenz Leutgeb <lorenz.leutgeb@gmail.com> +Brandon Cheng <bcheng.gt@gmail.com> +Alexis Campailla <alexis@janeasystems.com> |