Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/git/cgmanifest.json

@@ -0,0 +1,66 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "textmate/git.tmbundle",
+					"repositoryUrl": "https://github.com/textmate/git.tmbundle",
+					"commitHash": "5870cf3f8abad3a6637bdf69250b5d2ded427dc4"
+				}
+			},
+			"licenseDetail": [
+				"Copyright (c) 2008 Tim Harper",
+				"",
+				"Permission is hereby granted, free of charge, to any person obtaining",
+				"a copy of this software and associated documentation files (the\"",
+				"Software\"), to deal in the Software without restriction, including",
+				"without limitation the rights to use, copy, modify, merge, publish,",
+				"distribute, sublicense, and/or sell copies of the Software, and to",
+				"permit persons to whom the Software is furnished to do so, subject to",
+				"the following conditions:",
+				"",
+				"The above copyright notice and this permission notice shall be",
+				"included in all copies or substantial portions of the Software.",
+				"",
+				"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
+				"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
+				"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+				"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
+				"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+				"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
+				"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+			],
+			"license": "MIT",
+			"version": "0.0.0"
+		},
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "textmate/diff.tmbundle",
+					"repositoryUrl": "https://github.com/textmate/diff.tmbundle",
+					"commitHash": "0593bb775eab1824af97ef2172fd38822abd97d7"
+				}
+			},
+			"licenseDetail": [
+				"Copyright (c) textmate-diff.tmbundle project authors",
+				"",
+				"If not otherwise specified (see below), files in this repository fall under the following license:",
+				"",
+				"Permission to copy, use, modify, sell and distribute this",
+				"software is granted. This software is provided \"as is\" without",
+				"express or implied warranty, and with no claim as to its",
+				"suitability for any purpose.",
+				"",
+				"An exception is made for files in readable text which contain their own license information,",
+				"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
+				"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
+				"\"tidy\" is accompanied by \"tidy-license.txt\"."
+			],
+			"license": "TextMate Bundle License",
+			"version": "0.0.0"
+		}
+	],
+	"version": 1
+}