Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 007031c

Browse filesBrowse files
committed
Merge branch 'v2.x'
2 parents 9205967 + b5cac46 commit 007031c
Copy full SHA for 007031c

File tree

Expand file treeCollapse file tree

1 file changed

+105
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+105
-1
lines changed

‎.mailmap

Copy file name to clipboard
+105-1Lines changed: 105 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,180 @@
1+
Adam Ortiz <adam.ortiz@utoronto.ca>
2+
13
Adrien F. Vincent <vincent.adrien@gmail.com>
4+
Adrien F. Vincent <vincent.adrien@gmail.com> <adrien.vincent@u-psud.fr>
5+
26
Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
7+
38
anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
9+
410
Ariel Hernán Curiale <curiale@gmail.com>
11+
512
Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>
13+
614
Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
15+
16+
Benjamin Congdon <bencongdon96@gmail.com>
17+
Benjamin Congdon <bencongdon96@gmail.com> bcongdon <bcongdo2@illinois.edu>
18+
719
Casper van der Wel <caspervdw@gmail.com>
20+
821
Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
922
Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
23+
1024
Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
25+
26+
Conner R. Phillips <conner.r.phillips@gmail.com> <conner.r.phillips.com>
27+
28+
Dan Hickstein <danhickstein@gmail.com>
29+
30+
Daniel Hyams <dhyams@gmail.com>
1131
Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
32+
1233
David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
34+
35+
Devashish Deshpande <ashu.9412@gmail.com>
36+
1337
endolith <endolith@gmail.com>
38+
1439
Eric Dill <thedizzle@gmail.com> <edill@bnl.gov>
40+
1541
Erik Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
42+
1643
Eric Ma <ericmajinglong@gmail.com> <ericmjl@Erics-MacBook-Pro.local>
1744
Eric Ma <ericmajinglong@gmail.com> <ericmjl@users.noreply.github.com>
45+
46+
Filipe Fernandes <ocefpaf@gmail.com>
47+
48+
Florian Le Bourdais <florian.s.lebourdais@gmail.com>
49+
1850
Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
51+
52+
hannah <story645@gmail.com>
53+
54+
Hans Moritz Günther <moritz.guenther@gmx.de>
55+
56+
J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>
57+
58+
Jack Kelly <jack.kelly@imperial.ac.uk> <daniel.kelly10@imperial.ac.uk>
59+
Jack Kelly <jack.kelly@imperial.ac.uk> <jack-list@xlk.org.uk>
60+
1961
Jaime Fernandez <jaime.frio@gmail.com>
62+
2063
Jake Vanderplas <jakevdp@gmail.com>
2164
Jake Vanderplas <jakevdp@gmail.com> <jakevdp@yahoo.com>
2265
Jake Vanderplas <jakevdp@gmail.com> <vanderplas@astro.washington.edu>
66+
2367
James R. Evans <jrevans1@earthlink.net>
68+
2469
Jeff Lutgen <jlutgen@gmail.com> <jlutgen@users.noreply.github.com>
70+
2571
Jeffrey Bingham <bingjeff@gmail.com>
72+
2673
Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
2774
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> <jens.nielsen@ucl.ac.uk>
75+
2876
John Hunter <jdh2358@gmail.com>
77+
2978
Jorrit Wronski <jowr@mek.dtu.dk>
30-
Jouni K. Seppänen <jks@iki.fi>
79+
3180
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Mad Physicist <madphysicist@users.noreply.github.com>
3281
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>
82+
83+
Jouni K. Seppänen <jks@iki.fi>
84+
3385
Julien Schueller <julien.schueller@gmail.com> <schueller@porsche-l64.phimeca.lan>
3486
Julien Schueller <julien.schueller@gmail.com> <schueller@bx-l64.phimeca.lan>
87+
3588
Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>
89+
3690
kikocorreoso <kikocorreoso@gmail.com> <kikocorreoso@users.noreply.github.com>
91+
92+
Klara Gerlei <klarizsofi@gmail.com>
93+
Klara Gerlei <klarizsofi@gmail.com> klaragerlei <s1466507@sms.ed.ac.uk>
94+
95+
Kristen M. Thyng <kthyng@gmail.com>
96+
3797
Leeonadoh <leo.sunpeng.li@gmail.com>
98+
3899
Lennart Fricke <lennart@die-frickes.eu> <lennart.fricke@kabelmail.de>
100+
39101
Levi Kilcher <levi.kilcher@nrel.gov>
102+
103+
Lion Krischer <lion.krischer@gmail.com> <krischer@geophysik.uni-muenchen.de>
104+
40105
Martin Fitzpatrick <martin.fitzpatrick@gmail.com> <mfitzp@abl.es>
106+
41107
Matthew Emmett <memmett@gmail.com>
42108
Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>
109+
43110
Matthias Bussonnier <bussonniermatthias@gmail.com>
111+
112+
Matthias Lüthi <maluethi@protonmail.ch>
113+
Matthias Lüthi <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>
114+
44115
Michael Droettboom <mdboom@gmail.com> <mdroe@stsci.edu>
45116
Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdboom@debian-vm>
117+
46118
Michiel de Hoon <mjldehoon@yahoo.com>
47119
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@mad002s-MacBook-Air.local>
48120
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
49121
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@Michiels-MacBook-Pro.local>
50122
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc.riken.jp>
123+
51124
MinRK <benjaminrk@gmail.com>
52125
MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
126+
53127
Nelle Varoquaux <nelle.varoquaux@gmail.com>
128+
54129
Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
55130
Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nse23@cornell.edu>
131+
56132
Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
133+
57134
OceanWolf <juichenieder-tigger@yahoo.co.uk>
135+
58136
Patrick Chen <pat.chen@mail.utoronto.ca>
137+
138+
Paul Hobson <pmhobson@gmail.com>
139+
Paul Hobson <pmhobson@gmail.com> vagrant <vagrant@precise32.(none)>
140+
59141
Paul Ivanov <pivanov314@gmail.com> <pi@berkeley.edu>
142+
60143
Per Parker <wisalam@live.com>
144+
61145
Peter Würtz <pwuertz@gmail.com>
62146
Peter Würtz <pwuertz@gmail.com> <pwuertz@googlemail.com>
147+
63148
Phil Elson <pelson.pub@gmail.com>
64149
Phil Elson <pelson.pub@gmail.com> <philipelson@hotmail.com>
65150
Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>
151+
152+
productivememberofsociety666 <productivememberofsociety666@sol.fr.am> none <none@example.net>
153+
154+
RyanPan <ryanbelt1993129@hotmail.com>
155+
66156
Scott Lasley <selasley@me.com>
157+
158+
Sebastian Raschka <mail@sebastianraschka.com>
159+
Sebastian Raschka <mail@sebastianraschka.com> <se.raschka@me.com>
160+
67161
Simon Cross <hodgestar+github@gmail.com> <hodgestar@gmail.com>
162+
163+
Slav Basharov <slavbacharov@gmail.com>
164+
68165
sohero <herosgq@gmail.com> sohero <ivip@tom.com>
166+
69167
Stefan van der Walt <stefanv@berkeley.edu> <stefan@sun.ac.za>
168+
70169
switham <github@mac-guyver.com> switham <switham_github@mac-guyver.com>
170+
71171
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
72172
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@uchicago.edu>
73173
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <“tcaswell@gmail.com”>
174+
175+
Trish Gillett-Kawamoto <trish.gillett@shopify.com> <discardthree@gmail.com>
176+
74177
Werner F Bruhin <wernerfbd@gmx.ch>
178+
75179
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
76180
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.