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 /.gitignore | |
| parent | 28eee0adb7884e21217c99cbf10a681c7d91b64a (diff) | |
| parent | b0277f35bd86d441255dc5a4c19e577e03f03a47 (diff) | |
| download | android-node-v8-a5778cdf01425ae39cea80b62f9ec6740aec724a.tar.gz android-node-v8-a5778cdf01425ae39cea80b62f9ec6740aec724a.tar.bz2 android-node-v8-a5778cdf01425ae39cea80b62f9ec6740aec724a.zip | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a86377cbe4..e00450690d 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,6 @@ deps/zlib/zlib.target.mk /SHASUMS*.txt* /tools/wrk/wrk + +# test artifacts +tools/faketime |