Merge branch 'v0.10'

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

diff --git a/.gitignore b/.gitignore
index e44636d..e0f5151 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 core
 vgcore.*
+v8*.log
+perf.data
+perf.data.old
 .waf*
 tags
 .lock-wscript
@@ -18,6 +21,7 @@ node_g
 # various stuff that VC++ produces/uses
 Debug/
 Release/
+!doc/blog/**
 *.sln
 !nodemsi.sln
 *.suo
@@ -39,6 +43,23 @@ ipch/
 /npm.wxs
 /tools/msvs/npm.wixobj
 email.md
-blog.html
 deps/v8-*
-node_modules
+./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