Merge branch 'master' into forOfLengthCache

Conflicts: Jakefile src/compiler/commandLineParser.ts src/compiler/types.ts
2026-05-17 11:24:29 -05:00 · 2015-03-29 00:09:29 -07:00
parent 7fff53cf33 78197ed60b
commit 3b35473e25
1982 changed files with 11612 additions and 29439 deletions
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -140,12 +140,6 @@ module ts {
            description: Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
            experimental: true
        },
-        {
-            name: "preserveNewLines",
-            type: "boolean",
-            description: Diagnostics.Preserve_new_lines_when_emitting_code,
-            experimental: true
-        },
        {
            name: "target",
            shortName: "t",