Merge branch 'v0.10'

[platform/upstream/nodejs.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 87b1fcc..e0f5151 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,15 @@ deps/v8-*
 deps/openssl/openssl.props
 deps/openssl/openssl.targets
 deps/openssl/openssl.xml
+
+# generated by gyp on android
+/*.target.mk
+/*.host.mk
+deps/openssl/openssl.target.mk
+deps/zlib/zlib.target.mk
+
+# build/release artifacts
+/*.tar.gz
+/SHASUMS*.txt*
+
+/tools/wrk/wrk