diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 16:43:58 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 17:26:47 +0100 |
| commit | 94e147500c5bf457c9101bda8c8020d8ff896708 (patch) | |
| tree | 7cdea05267b4d7c118bab4902c8ccc76216128f3 /.gitignore | |
| parent | 261706e2ef9f12131ddcf8ff40fd4c7823693e8d (diff) | |
| parent | 372a2f56bed341a23c435c5a94fbb77dbbd6c600 (diff) | |
| download | android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.tar.gz android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.tar.bz2 android-node-v8-94e147500c5bf457c9101bda8c8020d8ff896708.zip | |
Merge remote-tracking branch 'joyent/v0.12' into v1.x
I was originally going to do this after the v0.11.15 release, but as
that release is three weeks overdue now, I decided not to wait any
longer; we don't want the delta to get too big.
Conflicts:
lib/net.js
test/simple/simple.status
PR-URL: https://github.com/iojs/io.js/pull/236
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 50e672fed9..4ed758e7a3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,9 @@ ipch/ email.md deps/v8-* deps/icu +deps/icu*.zip +deps/icu*.tgz +deps/icu-tmp ./node_modules .svn/ |