Merge branch 'js/mingw-gcc-stack-protect'

diff --git a/.gitignore b/.gitignore
index 4470d7cfc0ae72991116f8d1b65fb03e35e88bdf..e096e0a51c19966eb743454fab50d232441008ca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -139,6 +139,7 @@
 /git-request-pull
 /git-rerere
 /git-reset
+/git-restore
 /git-rev-list
 /git-rev-parse
 /git-revert
@@ -163,6 +164,7 @@
 /git-submodule
 /git-submodule--helper
 /git-svn
+/git-switch
 /git-symbolic-ref
 /git-tag
 /git-unpack-file
@@ -223,6 +225,11 @@
 *.user
 *.idb
 *.pdb
+*.ilk
+*.iobj
+*.ipdb
+*.dll
+.vs/
 /Debug/
 /Release/
 *.dSYM