Merge branch 'js/visual-studio'

diff --git a/.gitignore b/.gitignore
index fcfb708b9e62dc846aedbc45a0fee207622ceb64..fc445edea9d3497b72c16629b0729c75d1ebae28 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@
 /git-difftool
 /git-difftool--helper
 /git-describe
+/git-env--helper
 /git-fast-export
 /git-fast-import
 /git-fetch
@@ -230,7 +231,6 @@
 *.ipdb
 *.dll
 .vs/
-*.manifest
 Debug/
 Release/
 /UpgradeLog*.htm