Merge remote-tracking branch 'origin/master' into tsserverVS-WIP

vladima · vladima · commit c5189ddeed7b · 2016-06-21T09:36:57.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1002,7 +1002,7 @@ namespace ts {
         directories: string[];
     }
 
-    interface FileMatcherPatterns {
+    export interface FileMatcherPatterns {
         includeFilePattern: string;
         includeDirectoryPattern: string;
         excludePattern: string;

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,7 @@ namespace ts {`
`1002`	`1002`	`directories: string[];`
`1003`	`1003`	`}`
`1004`	`1004`
`1005`		`- interface FileMatcherPatterns {`
	`1005`	`+ export interface FileMatcherPatterns {`
`1006`	`1006`	`includeFilePattern: string;`
`1007`	`1007`	`includeDirectoryPattern: string;`
`1008`	`1008`	`excludePattern: string;`