Merge branch 'vscode-ignores' of https://github.com/Eyas/TypeScript into Eyas-vscode-ignores

mhegazy · mhegazy · commit 20eaa22b0272 · 2015-09-28T14:10:13.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -50,5 +50,6 @@ scripts/typings/
 coverage/
 internal/
 **/.DS_Store
-.settings/*
-!.settings/tasks.json
+.settings
+.vscode/*
+!.vscode/tasks.json
diff --git a/.npmignore b/.npmignore
@@ -5,4 +5,5 @@ src
 tests
 Jakefile
 .travis.yml
-.settings/
+.settings/
+.vscode/
