Merge branch 'master' of github.com:SublimeText/PowerShell

vors · vors · commit 311af821986f · 2014-10-09T10:54:20.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,10 @@
 *.pyc
 *.cache
-*.sublime-project
+
+# Editor files
+*.sublime-workspace
+
+# Temporary/generated files
 dist/
 MANIFEST
-
-# Ignore YAML syntax file:
-# plist is a master file for syntax.
-Support/PowershellSyntax.YAML-tmLanguage
+*.YAML-tmLanguage
diff --git a/.hgignore b/.hgignore
diff --git a/PowerShell.sublime-project b/PowerShell.sublime-project
@@ -0,0 +1,9 @@
+{
+	"folders":
+	[
+		{
+			"follow_symlinks": true,
+			"path": "."
+		}
+	]
+}
