diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-19 09:12:32 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-19 09:12:32 -0800 |
| commit | 845e5d345890fabe97d3aa58cbf4e131c91e1559 (patch) | |
| tree | 1c0821547e7a393051a8818b1a57a76e3c2a2f43 /AUTHORS | |
| parent | ae0299287209e6d1dd0606c885ca087e82ed0e7d (diff) | |
| parent | 085db9dd6c1f3faf526c16170e9ffe89b8ec6211 (diff) | |
| download | nodejs-845e5d345890fabe97d3aa58cbf4e131c91e1559.tar.gz nodejs-845e5d345890fabe97d3aa58cbf4e131c91e1559.tar.bz2 nodejs-845e5d345890fabe97d3aa58cbf4e131c91e1559.zip | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/unix/linux-core.c
deps/uv/src/unix/stream.c
deps/uv/src/unix/sunos.c
deps/uv/src/version.c
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -514,7 +514,6 @@ 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> @@ -524,3 +523,9 @@ Jo Liss <joliss42@gmail.com> Jun Ma <roammm@gmail.com> Jacob Hoffman-Andrews <github@hoffman-andrews.com> Keith M Wesolowski <wesolows@joyent.com> +Maxime Quandalle <maxime.quandalle@gmail.com> +Doron Pagot <doronpagot@gmail.com> +Kenan Sulayman <kenan@sly.mn> +Christian Schulz <me@rndm.de> +Pedro Ballesteros <nitroduna@gmail.com> +Anton Khlynovskiy <subzey@gmail.com> |