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

@@ -14,11 +14,11 @@
"node-pty": "0.9.0-beta19",
"nsfw": "1.2.5",
"onigasm-umd": "^2.2.2",
"semver": "^5.5.0",
"semver-umd": "^5.5.3",
"spdlog": "^0.9.0",
"vscode-chokidar": "2.1.7",
"vscode-proxy-agent": "0.4.0",
"vscode-ripgrep": "^1.3.1",
"vscode-ripgrep": "^1.5.4",
"vscode-textmate": "^4.2.2",
"xterm": "3.15.0-beta71",
"xterm-addon-search": "0.2.0-beta2",