diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-04-29 14:08:51 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-04-29 14:08:51 +0200 |
| commit | af1ed99ce2d209e33a7c2aaedaff041fb1b5e8ad (patch) | |
| tree | 7ce31d561a7b47d42c31ebc159983c6c82566ddd /AUTHORS | |
| parent | 9cfc92979b6296e431769f5569c5a979bf217e73 (diff) | |
| parent | 4fdb8acdaef4c3cb1d855e992ada0e63fee520a6 (diff) | |
| download | android-node-v8-af1ed99ce2d209e33a7c2aaedaff041fb1b5e8ad.tar.gz android-node-v8-af1ed99ce2d209e33a7c2aaedaff041fb1b5e8ad.tar.bz2 android-node-v8-af1ed99ce2d209e33a7c2aaedaff041fb1b5e8ad.zip | |
Merge remote-tracking branch 'origin/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/src/version.c
lib/http.js
src/node_crypto.cc
src/node_os.cc
src/node_version.h
test/simple/helper-debugger-repl.js
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -434,13 +434,16 @@ Benjamin Ruston <benjy.ruston@gmail.com> Manav Rathi <manav.r@directi.com> Marcin Kostrzewa <marcinkostrzewa@yahoo.com> Suwon Chae <doortts@gmail.com> +David Braun <NodeJS-box@snkmail.com> Mitar Milutinovic <mitar.git@tnode.com> Michael Hart <michael.hart.au@gmail.com> Andrew Hart <hartandrewr@gmail.com> Rafael Garcia <rgarcia2009@gmail.com> Tobias Müllerleile <tobias@muellerleile.net> -David Braun <NodeJS-box@snkmail.com> Stanislav Ochotnicky <sochotnicky@redhat.com> Ryan Graham <r.m.graham@gmail.com> Kelly Gerber <kellygerber22@yahoo.com> Ryan Doenges <rhdoenges@gmail.com> +Sean Silva <chisophugis@gmail.com> +Miroslav Bajtoš <miro.bajtos@gmail.com> +Olof Johansson <olof@ethup.se> |