Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 21:11:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sandy081/userDataProvider

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-09-15 19:52:27 +02:00
parent 4ffcfff8b9 0a335ea664
commit 317ed7e1a5
281 changed files with 7541 additions and 5362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/workbench.common.main.ts
View File

@@ -77,6 +77,7 @@ import 'vs/workbench/services/notification/common/notificationService';
import 'vs/workbench/services/extensions/common/staticExtensions';
import 'vs/workbench/services/userData/common/userDataSyncStoreService';
import 'vs/workbench/services/userData/common/userDataSyncService';
import 'vs/workbench/services/workspace/browser/workspaceEditingService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
@@ -159,6 +160,7 @@ import 'vs/workbench/contrib/scm/browser/scmViewlet';
import 'vs/workbench/contrib/debug/browser/debug.contribution';
import 'vs/workbench/contrib/debug/browser/debugQuickOpen';
import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
import 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
import 'vs/workbench/contrib/debug/browser/repl';
import 'vs/workbench/contrib/debug/browser/debugViewlet';
@@ -221,6 +223,9 @@ import 'vs/workbench/contrib/format/browser/format.contribution';
// Themes
import 'vs/workbench/contrib/themes/browser/themes.contribution';
// Update
import 'vs/workbench/contrib/update/browser/update.contribution';
// Watermark
import 'vs/workbench/contrib/watermark/browser/watermark';