diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-08-07 16:33:35 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-08-07 16:33:35 -0700 |
| commit | a5778cdf01425ae39cea80b62f9ec6740aec724a (patch) | |
| tree | 6b011b6046ca68ee33e2cd811048f3e40558d7d9 /AUTHORS | |
| parent | 28eee0adb7884e21217c99cbf10a681c7d91b64a (diff) | |
| parent | b0277f35bd86d441255dc5a4c19e577e03f03a47 (diff) | |
| download | node-new-a5778cdf01425ae39cea80b62f9ec6740aec724a.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10' into v0.12
Conflicts:
ChangeLog
Makefile
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/unix/darwin.c
deps/uv/src/unix/getaddrinfo.c
deps/uv/src/version.c
deps/v8/src/checks.h
deps/v8/src/isolate.h
lib/cluster.js
lib/module.js
lib/timers.js
lib/tls.js
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -557,3 +557,8 @@ Greg Sabia Tucker <greg@narrowlabs.com> Calvin Metcalf <calvin.metcalf@gmail.com> cjihrig <cjihrig@gmail.com> Chris Barber <chris@cb1inc.com> +Nick Apperson <apperson@gmail.com> +Oguz Bastemur <obastemur@gmail.com> +Maurice Butler <maurice.butler@gmail.com> +Chris Dickinson <christopher.s.dickinson@gmail.com> +Julien Gilli <julien.gilli@joyent.com> |