Merge branch 'v0.10'

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

diff --git a/.gitignore b/.gitignore
index f3b6236..e0f5151 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,65 @@
-build
+core
+vgcore.*
+v8*.log
+perf.data
+perf.data.old
 .waf*
 tags
 .lock-wscript
 *.pyc
 doc/api.xml
-tools/nodejs.pc
-test/fixtures/hello.txt
 tmp/
 node
 node_g
 *.swp
 .benchmark_reports
 /.project
-/.cproject
\ No newline at end of file
+/.cproject
+
+/out
+
+# various stuff that VC++ produces/uses
+Debug/
+Release/
+!doc/blog/**
+*.sln
+!nodemsi.sln
+*.suo
+*.vcproj
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
+UpgradeLog*.XML
+_UpgradeReport_Files/
+ipch/
+*.sdf
+*.opensdf
+
+/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