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

This commit is contained in:
Ryan Cavanaugh
2015-06-22 22:41:41 -07:00
52 changed files with 17737 additions and 15413 deletions

View File

@@ -120,6 +120,7 @@ namespace ts {
{
name: "out",
type: "string",
isFilePath: true,
description: Diagnostics.Concatenate_and_emit_output_to_single_file,
paramType: Diagnostics.FILE,
},