merge with master

This commit is contained in:
Vladimir Matveev
2015-10-01 14:05:10 -07:00
311 changed files with 5842 additions and 2976 deletions

View File

@@ -490,7 +490,7 @@ namespace ts {
fileNames = map(<string[]>json["files"], s => combinePaths(basePath, s));
}
else {
errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
}
}
else {