Merge branch 'v0.10'

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

diff --git a/.gitignore b/.gitignore
index e77d5df..e0f5151 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-
+core
+vgcore.*
+v8*.log
+perf.data
+perf.data.old
 .waf*
 tags
 .lock-wscript
@@ -17,7 +21,9 @@ node_g
 # various stuff that VC++ produces/uses
 Debug/
 Release/
+!doc/blog/**
 *.sln
+!nodemsi.sln
 *.suo
 *.vcproj
 *.vcxproj
@@ -29,6 +35,31 @@ ipch/
 *.sdf
 *.opensdf
 
-/options.gypi
+/config.mk
+/config.gypi
 *-nodegyp*
 /gyp-mac-tool
+/dist-osx
+/npm.wxs
+/tools/msvs/npm.wixobj
+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