Merge branch 'master' into extension-viewlet

This commit is contained in:
Joao Moreno
2016-06-21 14:13:35 +02:00
228 changed files with 9800 additions and 5988 deletions

View File

@@ -49,9 +49,6 @@ import 'vs/workbench/parts/output/browser/output.contribution';
import 'vs/workbench/parts/terminal/electron-browser/terminal.contribution';
import 'vs/workbench/parts/markdown/browser/markdown.contribution';
import 'vs/workbench/parts/markdown/browser/markdownActions.contribution';
import 'vs/workbench/browser/workbench';
import 'vs/workbench/parts/tasks/electron-browser/task.contribution';