Anthony Dresser ee3663c1cd Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430) ...

* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors

2019-07-18 18:32:57 -07:00

..

azure-pipelines

Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

2019-07-18 18:32:57 -07:00

builtin

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

lib

Remove some differences from us and vscode (#6421)

2019-07-18 17:57:00 -07:00

monaco

Vscode merge (#4582)

2019-03-19 17:44:35 -07:00

npm

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

win32

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

.cachesalt

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

.nativeignore

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

builtInExtensions.json

Merge from master

2019-02-21 17:56:04 -08:00

dependencies.js

Merge from master

2019-02-21 17:56:04 -08:00

gulpfile.compile.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.editor.js

Vscode merge (#4582)

2019-03-19 17:44:35 -07:00

gulpfile.extensions.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.hygiene.js

Inital platform relayering (#6385)

2019-07-18 17:29:17 -07:00

gulpfile.mixin.js

Customize mixin strings for insiders build (#5569)

2019-05-22 12:33:23 -07:00

gulpfile.reh.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.sql.js

Renable Strict TSLint (#5018)

2019-04-18 00:34:53 -07:00

gulpfile.vscode.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.vscode.linux.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.vscode.web.js

Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

2019-07-15 22:35:46 -07:00

gulpfile.vscode.win32.js

Remove some differences from us and vscode (#6421)

2019-07-18 17:57:00 -07:00

jsconfig.json

Merge from master

2019-02-21 17:56:04 -08:00

package.json

Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

2019-07-18 18:32:57 -07:00

tsconfig.build.json

Merge VS Code 1.21 source code (#1067)

2018-04-04 15:27:51 -07:00

tsconfig.json

Merge from vscode 31e03b8ffbb218a87e3941f2b63a249f061fe0e4 (#4986)

2019-04-10 16:29:23 -07:00

tslint.json

Merge VS Code 1.21 source code (#1067)

2018-04-04 15:27:51 -07:00

yarn.lock

Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

2019-07-18 18:32:57 -07:00