Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors
This commit is contained in:
Anthony Dresser
2019-07-18 18:32:57 -07:00
committed by GitHub
parent bf4815d364
commit ee3663c1cd
158 changed files with 3101 additions and 2361 deletions

View File

@@ -66,14 +66,14 @@
"reflect-metadata": "^0.1.8",
"rxjs": "5.4.0",
"sanitize-html": "^1.19.1",
"semver": "^5.5.0",
"semver-umd": "^5.5.3",
"slickgrid": "github:anthonydresser/SlickGrid#2.3.29",
"spdlog": "^0.9.0",
"sudo-prompt": "9.0.0",
"v8-inspect-profiler": "^0.0.20",
"vscode-chokidar": "2.1.7",
"vscode-proxy-agent": "0.4.0",
"vscode-ripgrep": "^1.3.1",
"vscode-ripgrep": "^1.5.4",
"vscode-sqlite3": "4.0.8",
"vscode-textmate": "^4.2.2",
"xterm": "3.15.0-beta71",
@@ -113,7 +113,7 @@
"fast-plist": "0.1.2",
"glob": "^5.0.13",
"gulp": "^4.0.0",
"gulp-atom-electron": "^1.20.0",
"gulp-atom-electron": "^1.21.1",
"gulp-azure-storage": "^0.10.0",
"gulp-buffer": "0.0.2",
"gulp-concat": "^2.6.1",
@@ -188,8 +188,8 @@
"optionalDependencies": {
"vscode-windows-ca-certs": "0.1.0",
"vscode-windows-registry": "1.0.1",
"windows-foreground-love": "0.1.0",
"windows-mutex": "0.2.1",
"windows-foreground-love": "0.2.0",
"windows-mutex": "0.3.0",
"windows-process-tree": "0.2.4"
}
}
}