Skip to content

Commit 9f72415

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into requireJson
2 parents b4e0062 + 24842b4 commit 9f72415

1,316 files changed

Lines changed: 209388 additions & 169807 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mailmap‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,9 @@ Adnan Chowdhury <bttf@users.noreply.github.com>
316316
Esakki Raj <esakkiraj.tce@gmail.com>
317317
Jack Williams <jw@jackw.io>
318318
Philippe Voinov <philippevoinov@gmail.com>
319-
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
319+
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
320+
AdityaDaflapurkar <adaflapurkar@gmail.com> # Aditya Daflapurkar
321+
Eric Grube <grubee79@gmail.com>
322+
Martyn Janes <martyn@obany.com>
323+
Ricardo N Feliciano <FelicianoTech@gmail.com>
324+
Sergii Bezliudnyi <serg.bezludny@gmail.com>

‎AUTHORS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TypeScript is authored by:
33
* Abubaker Bashir
44
* Adam Freidin
55
* Adi Dahiya
6+
* Aditya Daflapurkar
67
* Adnan Chowdhury
78
* Adrian Leonhard
89
* Ahmad Farid
@@ -85,6 +86,7 @@ TypeScript is authored by:
8586
* @e-cloud
8687
* Elisée Maurer
8788
* Emilio García-Pumarino
89+
* Eric Grube
8890
* Eric Tsang
8991
* Erik Edrosa
9092
* Erik McClenney
@@ -184,6 +186,7 @@ TypeScript is authored by:
184186
* Marius Schulz
185187
* Martin Hiller
186188
* Martin Vseticka
189+
* Martyn Janes
187190
* Masahiro Wakame
188191
* Matt Bierner
189192
* Matt McCutchen
@@ -237,6 +240,7 @@ TypeScript is authored by:
237240
* Raj Dosanjh
238241
* Reiner Dolp
239242
* Remo H. Jansen
243+
* Ricardo N Feliciano
240244
* Richard Karmazín
241245
* Richard Knoll
242246
* Richard Sentino
@@ -252,6 +256,7 @@ TypeScript is authored by:
252256
* Sean Barag
253257
* Sergey Rubanov
254258
* Sergey Shandar
259+
* Sergii Bezliudnyi
255260
* Sharon Rolel
256261
* Sheetal Nandi
257262
* Shengping Zhong

‎Jakefile.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ var harnessCoreSources = [
115115
});
116116

117117
var harnessSources = harnessCoreSources.concat([
118+
"base64.ts",
118119
"incrementalParser.ts",
119120
"jsDocParsing.ts",
120121
"services/colorization.ts",
@@ -153,6 +154,7 @@ var harnessSources = harnessCoreSources.concat([
153154
"transform.ts",
154155
"customTransforms.ts",
155156
"programMissingFiles.ts",
157+
"programNoParseFalsyFileNames.ts",
156158
"symbolWalker.ts",
157159
"languageService.ts",
158160
"publicApi.ts",

0 commit comments

Comments
 (0)