Merge branch 'master' into exportDefaultType

Conflicts:
	src/compiler/checker.ts
This commit is contained in:
Mohamed Hegazy
2015-03-15 14:23:40 -07:00
59 changed files with 13641 additions and 27118 deletions

View File

@@ -1559,8 +1559,9 @@ module ts {
target?: ScriptTarget;
version?: boolean;
watch?: boolean;
stripInternal?: boolean;
preserveNewLines?: boolean;
/* @internal */ stripInternal?: boolean;
/* @internal */ preserveNewLines?: boolean;
/* @internal */ cacheDownlevelForOfLength?: boolean;
[option: string]: string | number | boolean;
}