Skip to content

Commit 6e58f61

Browse files
committed
Merge branch 'master' into limitDeepInstantiations
2 parents 68ab129 + 9bfba73 commit 6e58f61

File tree

2 files changed

+49
-3
lines changed

2 files changed

+49
-3
lines changed

.mailmap

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11

22
AbubakerB <[email protected]> # Abubaker Bashir
33
Alexander <[email protected]># Alexander Kuvaev
4+
Aluan Haddad <[email protected]>
45
Adam Freidin <[email protected]> Adam Freidin <[email protected]>
56
Adi Dahiya <[email protected]> Adi Dahiya <[email protected]>
67
Ahmad Farid <[email protected]> ahmad-farid <[email protected]>
78
Alexander Rusakov <[email protected]>
89
Alex Eagle <[email protected]>
910
Anatoly Ressin <[email protected]>
10-
Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]>
11+
Anders Hejlsberg <[email protected]> unknown <[email protected]> unknown <[email protected]> Anders Hejlsberg <Anders Hejlsberg>
1112
about-code <[email protected]> # Andreas Martin
1213
Andrej Baran <[email protected]>
1314
Andrew Ochsner <[email protected]>
@@ -24,6 +25,7 @@ Basarat Ali Syed <[email protected]> Basarat Syed <[email protected]> basa
2425
Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
2526
Ben Duffield <[email protected]>
2627
Ben Mosher <[email protected]>
28+
Benjamin Bock <[email protected]>
2729
Blake Embrey <[email protected]>
2830
Bowden Kelly <[email protected]>
2931
Brett Mayen <[email protected]>
@@ -49,6 +51,7 @@ Dirk Holtwick <[email protected]>
4951
5052
Doug Ilijev <[email protected]>
5153
Erik Edrosa <[email protected]>
54+
Erik McClenney <[email protected]>
5255
erictsangx <[email protected]> # Eric Tsang
5356
Ethan Rubio <[email protected]>
5457
Evan Martin <[email protected]>
@@ -68,13 +71,18 @@ Guillaume Salles <[email protected]>
6871
Guy Bedford <[email protected]> guybedford <[email protected]>
6972
Harald Niesche <[email protected]>
7073
Homa Wong <[email protected]>
74+
Hendrik Liebau <[email protected]>
7175
Iain Monro <[email protected]>
76+
IgorNovozhilov <[email protected]> # Igor Novozhilov
7277
Ingvar Stepanyan <[email protected]>
7378
impinball <[email protected]> # Isiah Meadows
79+
Iwata Hidetaka <[email protected]>
7480
Ivo Gabe de Wolff <[email protected]>
7581
Jakub Młokosiewicz <[email protected]>
7682
James Whitney <[email protected]>
83+
James Henry <[email protected]>
7784
Jason Freeman <[email protected]> Jason Freeman <[email protected]>
85+
Jason Jarrett <[email protected]>
7886
Jason Killian <[email protected]>
7987
Jason Ramsay <[email protected]> jramsay <[email protected]>
8088
@@ -89,6 +97,7 @@ Jonathan Toland <[email protected]>
8997
Jesse Schalken <[email protected]>
9098
9199
Josh Abernathy <[email protected]> joshaber <[email protected]>
100+
Josh Goldberg <[email protected]>
92101
Josh Kalderimis <[email protected]>
93102
Josh Soref <[email protected]>
94103
Juan Luis Boya García <[email protected]>
@@ -107,20 +116,26 @@ Keith Mashinter <[email protected]> kmashint <[email protected]>
107116
Ken Howard <[email protected]>
108117
Kevin Lang <[email protected]>
109118
kimamula <[email protected]> # Kenji Imamula
119+
Kitson Kelly <[email protected]>
110120
Klaus Meinhardt <[email protected]>
111121
Kyle Kelley <[email protected]>
112122
Lorant Pinter <[email protected]>
113123
Lucien Greathouse <[email protected]>
114124
Lukas Elmer <[email protected]> Lukas Elmer <[email protected]>
125+
Magnus Hiie <[email protected]>
115126
Martin Vseticka <[email protected]> Martin Všeticka <[email protected]> MartyIX <[email protected]>
116127
gcnew <[email protected]> # Marin Marinov
117128
vvakame <[email protected]> # Masahiro Wakame
118-
Matt McCutchen <[email protected]>
129+
Matt McCutchen <[email protected]> Matt McCutchen <[email protected]>
130+
Matt Bierner <[email protected]>
119131
MANISH-GIRI <[email protected]> # Manish Giri
120132
Max Deepfield <[email protected]>
121133
Micah Zoltu <[email protected]>
122134
135+
Mike Busyrev <[email protected]>
136+
Mine Starks <[email protected]> Mine Starks <[email protected]>
123137
Mohamed Hegazy <[email protected]>
138+
ncoley <[email protected]> # Natalie Coley
124139
Nathan Shively-Sanders <[email protected]>
125140
Nathan Yee <[email protected]>
126141
Nima Zahedi <[email protected]>
@@ -143,19 +158,22 @@ Rado Kirov <[email protected]>
143158
Ron Buckton <[email protected]> Ron Buckton <[email protected]> rbuckton <[email protected]>
144159
Rostislav Galimsky <[email protected]>
145160
Richard Knoll <[email protected]> Richard Knoll <[email protected]>
161+
Richard Karmazín <[email protected]>
146162
Rowan Wyborn <[email protected]>
147163
Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
148164
Ryohei Ikegami <[email protected]>
149165
Sarangan Rajamanickam <[email protected]>
150166
Sébastien Arod <[email protected]>
151167
Sergey Shandar <[email protected]>
168+
chico <[email protected]> # Sergey Rubanov
152169
Sheetal Nandi <[email protected]>
153170
Shengping Zhong <[email protected]>
154171
155172
Sam El-Husseini <[email protected]>
156173
Simon Hürlimann <[email protected]>
157174
Slawomir Sadziak <[email protected]>
158175
Solal Pirelli <[email protected]>
176+
Soo Jae Hwang <[email protected]>
159177
Stan Thomas <[email protected]>
160178
Stanislav Sysoev <[email protected]>
161179
Steve Lucco <[email protected]> steveluc <[email protected]>
@@ -173,6 +191,7 @@ Torben Fitschen <[email protected]>
173191
TruongSinh Tran-Nguyen <[email protected]>
174192
vilicvane <[email protected]> # Vilic Vane
175193
Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
194+
Vadi Taslim <[email protected]>
176195
Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
177196
178197
Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
@@ -199,6 +218,7 @@ Aliaksandr Radzivanovich <[email protected]>
199218
BuildTools <[email protected]> # Franklin Tse
200219
ChogyDan <[email protected]> # Daniel Hollocher
201220
Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
221+
DLehenbauer <[email protected]> # Daniel Lehenbauer
202222
David Kmenta <[email protected]>
203223
E020873 <[email protected]> # Nicolas Henry
204224
Elisée Maurer <[email protected]>
@@ -225,4 +245,7 @@ Viktor Zozulyak <[email protected]>
225245
rix <[email protected]> # Richard Sentino
226246
rohitverma007 <[email protected]> # Rohit Verma
227247
rdosanjh <[email protected]> # Raj Dosanjh
228-
gdh1995 <[email protected]> # Dahan Gong
248+
gdh1995 <[email protected]> # Dahan Gong
249+
cedvdb <[email protected]> # @cedvdb
250+
kpreisser <[email protected]> # K. Preißer
251+
e-cloud <[email protected]> # @e-cloud

AUTHORS.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ TypeScript is authored by:
1010
* Alexander Rusakov
1111
* Ali Sabzevari
1212
* Aliaksandr Radzivanovich
13+
* Aluan Haddad
1314
* Anatoly Ressin
1415
* Anders Hejlsberg
1516
* Andreas Martin
@@ -29,13 +30,15 @@ TypeScript is authored by:
2930
* Basarat Ali Syed
3031
* Ben Duffield
3132
* Ben Mosher
33+
* Benjamin Bock
3234
* Bill Ticehurst
3335
* Blake Embrey
3436
* @bootstraponline
3537
* Bowden Kelly
3638
* Brett Mayen
3739
* Bryan Forbes
3840
* Caitlin Potter
41+
* @cedvdb
3942
* Charly POLY
4043
* Chris Bubernak
4144
* Christophe Vidal
@@ -49,6 +52,7 @@ TypeScript is authored by:
4952
* Dan Corder
5053
* Dan Quirk
5154
* Daniel Hollocher
55+
* Daniel Lehenbauer
5256
* Daniel Rosenwasser
5357
* David Kmenta
5458
* David Li
@@ -60,10 +64,12 @@ TypeScript is authored by:
6064
* Dirk Holtwick
6165
* Dom Chen
6266
* Doug Ilijev
67+
* @e-cloud
6368
* Elisée Maurer
6469
* Emilio García-Pumarino
6570
* Eric Tsang
6671
* Erik Edrosa
72+
* Erik McClenney
6773
* Ethan Resnick
6874
* Ethan Rubio
6975
* Evan Martin
@@ -84,15 +90,20 @@ TypeScript is authored by:
8490
* Guillaume Salles
8591
* Guy Bedford
8692
* Harald Niesche
93+
* Hendrik Liebau
8794
* Herrington Darkholme
8895
* Homa Wong
8996
* Iain Monro
97+
* Igor Novozhilov
9098
* Ingvar Stepanyan
9199
* Isiah Meadows
92100
* Ivo Gabe de Wolff
101+
* Iwata Hidetaka
93102
* Jakub Młokosiewicz
103+
* James Henry
94104
* James Whitney
95105
* Jason Freeman
106+
* Jason Jarrett
96107
* Jason Killian
97108
* Jason Ramsay
98109
* JBerger
@@ -110,38 +121,46 @@ TypeScript is authored by:
110121
* Jonathan Turner
111122
* Jonathon Smith
112123
* Josh Abernathy
124+
* Josh Goldberg
113125
* Josh Kalderimis
114126
* Josh Soref
115127
* Juan Luis Boya García
116128
* Julian Williams
117129
* Justin Bay
118130
* Justin Johansson
131+
* K. Preißer
119132
* Kagami Sascha Rosylight
120133
* Kanchalai Tanglertsampan
121134
* Keith Mashinter
122135
* Ken Howard
123136
* Kenji Imamula
124137
* Kevin Lang
138+
* Kitson Kelly
125139
* Klaus Meinhardt
126140
* Kyle Kelley
127141
* Kārlis Gaņģis
128142
* Lorant Pinter
129143
* Lucien Greathouse
130144
* Lukas Elmer
145+
* Magnus Hiie
131146
* Manish Giri
132147
* Marin Marinov
133148
* Marius Schulz
134149
* Martin Vseticka
135150
* Masahiro Wakame
151+
* Matt Bierner
136152
* Matt McCutchen
137153
* Mattias Buelens
138154
* Mattias Buelens
139155
* Max Deepfield
140156
* Micah Zoltu
141157
* Michael
142158
* Michael Bromley
159+
* Mike Busyrev
160+
* Mine Starks
143161
* Mohamed Hegazy
144162
* Myles Megyesi
163+
* Natalie Coley
145164
* Nathan Shively-Sanders
146165
* Nathan Yee
147166
* Nicolas Henry
@@ -167,6 +186,7 @@ TypeScript is authored by:
167186
* Punya Biswal
168187
* Rado Kirov
169188
* Raj Dosanjh
189+
* Richard Karmazín
170190
* Richard Knoll
171191
* Richard Sentino
172192
* Robert Coie
@@ -178,13 +198,15 @@ TypeScript is authored by:
178198
* Ryohei Ikegami
179199
* Sam El-Husseini
180200
* Sarangan Rajamanickam
201+
* Sergey Rubanov
181202
* Sergey Shandar
182203
* Sheetal Nandi
183204
* Shengping Zhong
184205
* Shyyko Serhiy
185206
* Simon Hürlimann
186207
* Slawomir Sadziak
187208
* Solal Pirelli
209+
* Soo Jae Hwang
188210
* Stan Thomas
189211
* Stanislav Sysoev
190212
* Steve Lucco
@@ -204,6 +226,7 @@ TypeScript is authored by:
204226
* Tomas Grubliauskas
205227
* Torben Fitschen
206228
* TruongSinh Tran-Nguyen
229+
* Vadi Taslim
207230
* Vidar Tonaas Fauske
208231
* Viktor Zozulyak
209232
* Vilic Vane

0 commit comments

Comments
 (0)