Merge branch 'master' into scm-api

This commit is contained in:
Joao Moreno
2016-12-05 17:33:47 +01:00
241 changed files with 4229 additions and 2484 deletions

View File

@@ -39,7 +39,7 @@ import { IApplyEditsOptions, TextEditorRevealType, ITextEditorConfigurationUpdat
import { InternalTreeExplorerNodeContent } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
export interface IEnvironment {
isBuilt: boolean;
enableProposedApi: boolean;
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;