Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/ini/package.json

@@ -0,0 +1,37 @@
+{
+	"name": "ini",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/ini.tmbundle Syntaxes/Ini.plist ./syntaxes/ini.tmLanguage.json"
+	},
+	"contributes": {
+		"languages": [{
+			"id": "ini",
+			"extensions": [ ".ini"],
+			"aliases": [ "Ini", "ini" ],
+			"configuration": "./ini.language-configuration.json"
+		},
+		{
+			"id": "properties",
+			"extensions": [ ".properties", ".cfg", ".conf", ".directory", ".gitattributes", ".gitconfig", ".gitmodules", ".editorconfig" ],
+			"filenames": [ "gitconfig" ],
+			"filenamePatterns": [ "**/.config/git/config", "**/.git/config" ],
+			"aliases": [ "Properties", "properties" ],
+			"configuration": "./properties.language-configuration.json"
+		}],
+		"grammars": [{
+			"language": "ini",
+			"scopeName": "source.ini",
+			"path": "./syntaxes/ini.tmLanguage.json"
+		},{
+			"language": "properties",
+			"scopeName": "source.ini",
+			"path": "./syntaxes/ini.tmLanguage.json"
+		}]
+	}
+}