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

This commit is contained in:
Pine Wu
2016-11-08 23:13:32 -08:00
174 changed files with 6613 additions and 5230 deletions

View File

@@ -46,6 +46,7 @@ import 'vs/workbench/parts/git/browser/gitViewlet'; // can be packaged separatel
import 'vs/workbench/parts/debug/electron-browser/debug.contribution';
import 'vs/workbench/parts/debug/electron-browser/repl';
import 'vs/workbench/parts/debug/browser/debugEditorActions';
import 'vs/workbench/parts/debug/browser/debugViewlet'; // can be packaged separately
import 'vs/workbench/parts/markers/markers.contribution';