8000 Merge pull request #5374 from jkseppan/mailmap · matplotlib/matplotlib@8c4e266 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8c4e266

Browse files
committed
Merge pull request #5374 from jkseppan/mailmap
MNT: Mailmap fixes and simplification
2 parents 42ea00f + fbf5958 commit 8c4e266

File tree

1 file changed

+56
-44
lines changed

1 file changed

+56
-44
lines changed

.mailmap

Lines changed: 56 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,73 @@
1-
Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
2-
anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
3-
Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
4-
Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
5-
Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
6-
Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
7-
Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
1+
Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
2+
anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
3+
Ariel Hernán Curiale <curiale@gmail.com>
4+
Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>
5+
Ben Root <ben.v.root@gmail.com>
6+
Casper van der Wel <caspervdw@gmail.com>
7+
Christoph Gohlke <cgohlke@uci.edu> <cgohlke@uci.edu>
8+
Cimarron Mittelsteadt <cimarronm@gmail.com>
9+
Daniel Hyams <dhyams@gmail.com>
810
Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
9-
Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
10-
Eric Dill <thedizzle@gmail.com> Eric Dill <edill@bnl.gov>
11-
Erik Bray <erik.m.bray@gmail.com> Erik M. Bray <embray@stsci.edu>
11+
David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
12+
endolith <endolith@gmail.com>
13+
Eric Dill <thedizzle@gmail.com> <edill@bnl.gov>
14+
Erik Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
15+
Eric Ma <ericmajinglong@gmail.com> <ericmjl@Erics-MacBook-Pro.local>
16+
Eric Ma <ericmajinglong@gmail.com> <ericmjl@users.noreply.github.com>
1217
Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
13-
Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <jakevdp@yahoo.com>
14-
Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington.edu>
15-
James R. Evans <jrevans1@earthlink.net> James Evans <jrevans1@earthlink.net>
16-
Jeffrey Bingham <bingjeff@gmail.com> Jeff Bingham <bingjeff@gmail.com>
17-
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
18-
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
19-
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
20-
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jens.nielsen@ucl.ac.uk>
21-
John Hunter <jdh2358@gmail.com> jdh2358 <jdh2358@gmail.com>
22-
Jouni K. Seppänen <jks@iki.fi> Jouni K. Seppänen <jks@iki.fi>
23-
Julien Schueller <julien.schueller@gmail.com> jschueller <schueller@porsche-l64.phimeca.lan>
24-
Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@bx-l64.phimeca.lan>
25-
Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@porsche-l64.phimeca.lan>
26-
Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
27-
kikocorreoso <kikocorreoso@gmail.com> kikocorreoso <kikocorreoso@users.noreply.github.com>
28-
Lennart Fricke <lennart@die-frickes.eu> Lennart Fricke <lennart.fricke@kabelmail.de>
29-
Levi Kilcher <levi.kilcher@nrel.gov> Levi Kilcher <Levi.Kilcher@nrel.gov>
30-
Martin Fitzpatrick <martin.fitzpatrick@gmail.com> Martin Fitzpatrick <mfitzp@abl.es>
31-
Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
32-
Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
33-
Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
18+
Jaime Fernandez <jaime.frio@gmail.com>
19+
Jake Vanderplas <jakevdp@gmail.com>
20+
Jake Vanderplas <jakevdp@gmail.com> <jakevdp@yahoo.com>
21+
Jake Vanderplas <jakevdp@gmail.com> <vanderplas@astro.washington.edu>
22+
James R. Evans <jrevans1@earthlink.net>
23+
Jeff Lutgen <jlutgen@gmail.com> <jlutgen@users.noreply.github.com>
24+
Jeffrey Bingham <bingjeff@gmail.com>
25+
Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
26+
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> <jens.nielsen@ucl.ac.uk>
27+
John Hunter <jdh2358@gmail.com>
28+
Jorrit Wronski <jowr@mek.dtu.dk>
29+
Jouni K. Seppänen <jks@iki.fi>
30+
Julien Schueller <julien.schueller@gmail.com> <schueller@porsche-l64.phimeca.lan>
31+
Julien Schueller <julien.schueller@gmail.com> <schueller@bx-l64.phimeca.lan>
32+
Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>
33+
kikocorreoso <kikocorreoso@gmail.com> <kikocorreoso@users.noreply.github.com>
34+
Leeonadoh <leo.sunpeng.li@gmail.com>
35+
Lennart Fricke <lennart@die-frickes.eu> <lennart.fricke@kabelmail.de>
36+
Levi Kilcher <levi.kilcher@nrel.gov>
37+
Martin Fitzpatrick <martin.fitzpatrick@gmail.com> <mfitzp@abl.es>
38+
Matthew Emmett <memmett@gmail.com>
39+
Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>
40+
Matthias Bussonnier <bussonniermatthias@gmail.com>
41+
Michael Droettboom <mdboom@gmail.com> <mdroe@stsci.edu>
3442
Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdboom@debian-vm>
43+
Michiel de Hoon <mjldehoon@yahoo.com>
3544
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@mad002s-MacBook-Air.local>
3645
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
3746
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@Michiels-MacBook-Pro.local>
3847
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc.riken.jp>
48+
MinRK <benjaminrk@gmail.com>
3949
MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
40-
Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>
50+
Nelle Varoquaux <nelle.varoquaux@gmail.com>
4151
Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
4252
Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nse23@cornell.edu>
43-
Nicolas P. Rougier <Nicolas.Rougier@inria.fr> Nicolas Rougier <Nicolas.Rougier@inria.fr>
44-
Paul Ivanov <pivanov314@gmail.com> Paul Ivanov <pi@berkeley.edu>
45-
Per Parker <wisalam@live.com> Per <wisalam@live.com>
46-
Per Parker <wisalam@live.com> solvents <wisalam@live.com>
47-
Peter Würtz <pwuertz@gmail.com> Peter Würtz <pwuertz@googlemail.com>
48-
Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@gmail.com>
49-
Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@googlemail.com>
50-
Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
51-
Phil Elson <pelson.pub@gmail.com> pelson <philipelson@hotmail.com>
52-
Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@gmail.com>
53-
Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@hotmail.com>
54-
Scott Lasley <selasley@me.com> selasley <selasley@me.com>
53+
Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
54+
OceanWolf <juichenieder-tigger@yahoo.co.uk>
55+
Patrick Chen <pat.chen@mail.utoronto.ca>
56+
Paul Ivanov <pivanov314@gmail.com> <pi@berkeley.edu>
57+
Per Parker <wisalam@live.com>
58+
Peter Würtz <pwuertz@gmail.com>
59+
Peter Würtz <pwuertz@gmail.com> <pwuertz@googlemail.com>
60+
Phil Elson <pelson.pub@gmail.com>
61+
Phil Elson <pelson.pub@gmail.com> <philipelson@hotmail.com>
62+
Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>
63+
Scott Lasley <selasley@me.com>
64+
Simon Cross <hodgestar+github@gmail.com> <hodgestar@gmail.com>
5565
sohero <herosgq@gmail.com> sohero <ivip@tom.com>
66+
Stefan van der Walt <stefanv@berkeley.edu> <stefan@sun.ac.za>
5667
switham <github@mac-guyver.com> switham <switham_github@mac-guyver.com>
5768
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
5869
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@uchicago.edu>
5970
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <“tcaswell@gmail.com”>
71+
Werner F Bruhin <wernerfbd@gmx.ch>
6072
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
6173
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>

0 commit comments

Comments
 (0)
0