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 'origin/master' into treeExplorerAPI

Browse Source
This commit is contained in:
Pine Wu
2016-10-31 12:50:19 -07:00
parent 70be684134 4482704deb
commit f5d4ede325
629 changed files with 9188 additions and 6394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,13 +84,13 @@ import 'vs/workbench/parts/contentprovider/common/contentprovider.contribution';
import 'vs/workbench/parts/themes/electron-browser/themes.contribution';
import 'vs/workbench/parts/feedback/electron-browser/feedback.contribution';
import 'vs/workbench/parts/feedback/browser/feedback.contribution';
import 'vs/workbench/parts/welcome/electron-browser/electronGettingStarted.contribution';
import 'vs/workbench/parts/welcome/browser/gettingStarted.contribution';
import 'vs/workbench/parts/update/electron-browser/update.contribution';
import 'vs/workbench/parts/nps/electron-browser/nps.contribution';
import 'vs/workbench/parts/nps/browser/nps.contribution';
import 'vs/workbench/parts/cli/electron-browser/cli.contribution';