diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-10 19:36:04 -0400 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-10 19:36:04 -0400 |
| commit | 1a09da6ec219883668564d5d6cd30e8867d7e97d (patch) | |
| tree | fda9b632fa5ab280286a2f0c1076bbaa008be362 /AUTHORS | |
| parent | ab50fad63bcbedd7c935a9c5d2ab9e4c7202c9f2 (diff) | |
| parent | 1cb6f1a46ad24c60ab1fccfa3f88aad9401e6444 (diff) | |
| download | node-new-1a09da6ec219883668564d5d6cd30e8867d7e97d.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/api.cc
deps/v8/src/unicode-inl.h
deps/v8/src/unicode.h
lib/_stream_readable.js
lib/http.js
src/cares_wrap.cc
src/node.cc
src/node_crypto.cc
src/node_dtrace.cc
src/node_file.cc
src/node_stat_watcher.cc
src/node_version.h
src/process_wrap.cc
src/string_bytes.cc
src/string_bytes.h
src/udp_wrap.cc
src/util.h
test/simple/test-buffer.js
test/simple/test-stream2-compatibility.js
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -553,3 +553,7 @@ Farrin Reid <blakmatrix@gmail.com> Denys Zariaiev <denys.zariaiev@gmail.com> Sean McArthur <sean.monstar@gmail.com> Rasmus Christian Pedersen <zerhacken@yahoo.com> +Greg Sabia Tucker <greg@narrowlabs.com> +Calvin Metcalf <calvin.metcalf@gmail.com> +cjihrig <cjihrig@gmail.com> +Chris Barber <chris@cb1inc.com> |