diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-05-01 13:54:23 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-05-01 13:54:23 -0700 |
| commit | b19b60a05c30fa4108c37ddfcabb9313655af652 (patch) | |
| tree | 68ad34a7ef5bbf35a5178eabd210fec5d6b1c7ef /AUTHORS | |
| parent | d1fe6857ba40f895968217d281d79677a9f0d9ae (diff) | |
| parent | f76c3938d0660378017bf276a72ea60e9adfe62c (diff) | |
| download | node-new-b19b60a05c30fa4108c37ddfcabb9313655af652.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Reverted 9520adeb37f5ebe02a68669ec97770f4869705bb
Conflicts:
deps/cares/src/ares_parse_txt_reply.c
deps/uv/.mailmap
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/include/uv.h
deps/uv/src/unix/error.c
deps/uv/src/unix/process.c
deps/uv/src/version.c
deps/uv/src/win/pipe.c
deps/uv/src/win/signal.c
deps/uv/src/win/util.c
deps/uv/test/test-spawn.c
deps/uv/vcbuild.bat
deps/v8/src/platform-posix.cc
deps/v8/tools/gyp/v8.gyp
lib/util.js
src/node.cc
test/simple/test-util-format.js
test/simple/test-util.js
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions