Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tyriar/webgl2

Browse Source
This commit is contained in:
Daniel Imms
2019-11-10 12:38:24 -08:00
parent c530c2ae17 03f576ee93
commit ca2c75906e
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"name": "code-oss-dev", "name": "code-oss-dev",
"version": "1.41.0", "version": "1.41.0",
"distro": "12156714756411f232707edb4976b1f5fac7cdbb", "distro": "be6ad88ea0214dfdb03b943bef28e7a5c9fc2e4b",
"author": { "author": {
"name": "Microsoft Corporation" "name": "Microsoft Corporation"
}, },
@@ -53,7 +53,7 @@
"vscode-ripgrep": "^1.5.7", "vscode-ripgrep": "^1.5.7",
"vscode-sqlite3": "4.0.9", "vscode-sqlite3": "4.0.9",
"vscode-textmate": "^4.3.0", "vscode-textmate": "^4.3.0",
"xterm": "4.3.0-beta11", "xterm": "4.3.0-beta17",
"xterm-addon-search": "0.4.0-beta4", "xterm-addon-search": "0.4.0-beta4",
"xterm-addon-web-links": "0.2.1", "xterm-addon-web-links": "0.2.1",
"xterm-addon-webgl": "0.4.0-beta2", "xterm-addon-webgl": "0.4.0-beta2",
remote/package.json
+1 -1
View File
@@ -20,7 +20,7 @@
"vscode-proxy-agent": "^0.5.1", "vscode-proxy-agent": "^0.5.1",
"vscode-ripgrep": "^1.5.7", "vscode-ripgrep": "^1.5.7",
"vscode-textmate": "^4.3.0", "vscode-textmate": "^4.3.0",
"xterm": "4.3.0-beta11", "xterm": "4.3.0-beta17",
"xterm-addon-search": "0.4.0-beta4", "xterm-addon-search": "0.4.0-beta4",
"xterm-addon-web-links": "0.2.1", "xterm-addon-web-links": "0.2.1",
"xterm-addon-webgl": "0.4.0-beta2", "xterm-addon-webgl": "0.4.0-beta2",
remote/web/package.json
+1 -1
View File
@@ -5,7 +5,7 @@
"onigasm-umd": "^2.2.2", "onigasm-umd": "^2.2.2",
"semver-umd": "^5.5.3", "semver-umd": "^5.5.3",
"vscode-textmate": "^4.3.0", "vscode-textmate": "^4.3.0",
"xterm": "4.3.0-beta11", "xterm": "4.3.0-beta17",
"xterm-addon-search": "0.4.0-beta4", "xterm-addon-search": "0.4.0-beta4",
"xterm-addon-web-links": "0.2.1", "xterm-addon-web-links": "0.2.1",
"xterm-addon-webgl": "0.4.0-beta2" "xterm-addon-webgl": "0.4.0-beta2"
remote/web/yarn.lock
+4 -4
View File
@@ -46,7 +46,7 @@ xterm-addon-webgl@0.4.0-beta2:
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327"
integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw== integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw==
xterm@4.3.0-beta11: xterm@4.3.0-beta17:
version "4.3.0-beta11" version "4.3.0-beta17"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta11.tgz#6be833d3fbebf3f7945ccc79ffb7d8811b31aa4e" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta17.tgz#c038cc00cb5be33d2a5f083255c329d9ed186565"
integrity sha512-E5V4cDiCWR2aZSnUrhBnGA880DcKkdylkf7CE4rTSxGGET9DPBlTvZciC1Tjn0TPjuJ/B7WQk/6FW/aXs4CS5w== integrity sha512-Lgz7vL12MBKJSgK/UXJF22Yw+uEXEE7YZDWfUD+/jbHAKN4geLQJ/Y/b3gxjLL020dnYZuayfKOr2KWdhKsmCA==
remote/yarn.lock
+4 -4
View File
@@ -433,10 +433,10 @@ xterm-addon-webgl@0.4.0-beta2:
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327"
integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw== integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw==
xterm@4.3.0-beta11: xterm@4.3.0-beta17:
version "4.3.0-beta11" version "4.3.0-beta17"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta11.tgz#6be833d3fbebf3f7945ccc79ffb7d8811b31aa4e" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta17.tgz#c038cc00cb5be33d2a5f083255c329d9ed186565"
integrity sha512-E5V4cDiCWR2aZSnUrhBnGA880DcKkdylkf7CE4rTSxGGET9DPBlTvZciC1Tjn0TPjuJ/B7WQk/6FW/aXs4CS5w== integrity sha512-Lgz7vL12MBKJSgK/UXJF22Yw+uEXEE7YZDWfUD+/jbHAKN4geLQJ/Y/b3gxjLL020dnYZuayfKOr2KWdhKsmCA==
yauzl@^2.9.2: yauzl@^2.9.2:
version "2.10.0" version "2.10.0"
yarn.lock
+4 -4
View File
@@ -9357,10 +9357,10 @@ xterm-addon-webgl@0.4.0-beta2:
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta2.tgz#3384a46b8b0856d2b5dc1a6f6724cfc4119de327"
integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw== integrity sha512-yFwMdC5L4PMDmzWV3DJYV1APeGOAcLdFblMRvJRuMzPba25jGmEg0Zg84O/oJ1sg2bjD3mzVA/C0ENn7bpKgHw==
xterm@4.3.0-beta11: xterm@4.3.0-beta17:
version "4.3.0-beta11" version "4.3.0-beta17"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta11.tgz#6be833d3fbebf3f7945ccc79ffb7d8811b31aa4e" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta17.tgz#c038cc00cb5be33d2a5f083255c329d9ed186565"
integrity sha512-E5V4cDiCWR2aZSnUrhBnGA880DcKkdylkf7CE4rTSxGGET9DPBlTvZciC1Tjn0TPjuJ/B7WQk/6FW/aXs4CS5w== integrity sha512-Lgz7vL12MBKJSgK/UXJF22Yw+uEXEE7YZDWfUD+/jbHAKN4geLQJ/Y/b3gxjLL020dnYZuayfKOr2KWdhKsmCA==
y18n@^3.2.1: y18n@^3.2.1:
version "3.2.1" version "3.2.1"