7 Commits

Author	SHA1	Message	Date
Anthony Dresser	82c1c57c76	Merge from vscode ec07311dab2556c9d66a4cb3eecdc21c524202e1 (#6739)	2019-08-13 19:14:03 -07:00
Anthony Dresser	df7645e4e5	Merge from vscode da3c97f3668393ebfcb9f8208d7616018d6d1859 (#5360)	2019-05-03 21:59:40 -07:00
Anthony Dresser	57242a2e13	Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)	2019-04-14 22:29:14 -07:00
Matt Irvine	86bac90001	Merge VS Code 1.31.1 (#4283)	2019-03-15 13:09:45 -07:00
Raj Musuku	666ae11639	Merge from master	2019-02-21 17:56:04 -08:00
Karl Burtram	dafb780987	Merge VS Code 1.21 source code (#1067) ... * Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms	2018-04-04 15:27:51 -07:00
Karl Burtram	251ae01c3e	Initial VS Code 1.19 source merge (#571) ... * Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula	2018-01-28 23:37:17 -08:00