Merge branch 'Microsoft/master' into update-css-intellisense

# Conflicts:
#	src/vs/languages/html/common/htmlTags.ts
This commit is contained in:
David Storey
2015-12-08 17:03:17 -08:00
parent db6f0f960e
commit 23db8835f5
504 changed files with 30211 additions and 27525 deletions

View File

@@ -0,0 +1,11 @@
{
"comments": {
"lineComment": "//",
"blockComment": [ "/*", "*/" ]
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
]
}