Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hide-activity-bar

Browse Source
This commit is contained in:
Benjamin Pasero
2016-11-10 09:21:41 +01:00
parent b994f2eadd 2d75d9505c
commit 86a4be175f
29 changed files with 1215 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/workbench.main.ts
View File

@@ -59,6 +59,9 @@ import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution';
import 'vs/workbench/parts/extensions/browser/extensionsQuickOpen';
import 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; // can be packaged separately
import 'vs/workbench/parts/explorers/browser/treeExplorer.contribution';
import 'vs/workbench/parts/explorers/common/treeExplorerActions.contribution';
import 'vs/workbench/parts/output/browser/output.contribution';
import 'vs/workbench/parts/output/browser/outputPanel'; // can be packaged separately