diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-12 11:32:41 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-12 11:32:41 -0800 |
| commit | 069dd07a1732c6a752773aaed9e8c18ab472375f (patch) | |
| tree | d7baaaa8d60ce09ad9d94fe4653ebae62c6bc250 /AUTHORS | |
| parent | 4d5489667cb073ec9d82ef292ecd0749de494238 (diff) | |
| parent | 1d5e7974451b04cd10afa29ca86641ad5cf68f46 (diff) | |
| download | android-node-v8-069dd07a1732c6a752773aaed9e8c18ab472375f.tar.gz android-node-v8-069dd07a1732c6a752773aaed9e8c18ab472375f.tar.bz2 android-node-v8-069dd07a1732c6a752773aaed9e8c18ab472375f.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/.mailmap
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/unix/darwin.c
deps/uv/src/unix/udp.c
deps/uv/src/version.c
deps/uv/test/test-list.h
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -498,3 +498,11 @@ Jacob Groundwater <groundwater@gmail.com> Jackson Tian <shyvo1987@gmail.com> fengmk2 <fengmk2@gmail.com> Tim Wood <washwithcare@gmail.com> +Linus Unnebäck <linus@folkdatorn.se> +Nikolai Vavilov <vvnicholas@gmail.com> +Michael Ridgway <mcridgway@gmail.com> +Yazhong Liu <yorkiefixer@gmail.com> +Gabriel Falkenberg <gabriel.falkenberg@gmail.com> +Kai Groner <kai@gronr.com> +Gabriel Farrell <g@grrawr.com> +Nicolas Kaiser <nikai@nikai.net> |