Merge branch 'v0.10'

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

diff --git a/.gitignore b/.gitignore
index d160912..e0f5151 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 core
 vgcore.*
+v8*.log
 perf.data
 perf.data.old
 .waf*
@@ -45,3 +46,20 @@ email.md
 deps/v8-*
 ./node_modules
 .svn/
+
+# generated by gyp on Windows
+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