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

Merge branch 'master' into joh/menus

Browse Source
This commit is contained in:
Johannes Rieken
2016-06-22 10:25:29 +02:00
parent e46de1220e 88f88a9093
commit 40deddb4a7
89 changed files with 6038 additions and 1904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ import 'vs/workbench/parts/markers/markers.contribution';
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/output/browser/output.contribution';