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

Merge remote-tracking branch 'upstream/master' into treeExplorerAPI

Browse Source
This commit is contained in:
Benjamin Pasero
2016-11-03 08:40:55 +01:00
parent 68284bbdab 9667aebe2c
commit a04f317d3a
279 changed files with 7617 additions and 6341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ import 'vs/workbench/parts/markers/browser/markersPanel'; // can be packaged sep
import 'vs/workbench/parts/html/browser/html.contribution';
import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution';
import 'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen';
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/treeExplorerViewlet.contribution';