Google Git
Sign in
chromium / external / github.com / numpy / numpy / refs/tags/v1.11.3 / . / .mailmap
blob: 373e7edfda701ce097f0272add85507a356d2ac9 [file] [log] [blame]
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]1# Prevent git from showing duplicate names with commands like "git shortlog"
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]2# See the manpage of git-shortlog for details.
3# The syntax is:
4# Name that should be used <email that should be used> Bad name <bad email>
5#
6# You can skip Bad name if it is the same as the one that should be used, and is unique.
7#
8# This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
9# gives no duplicates.
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]10
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]11Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
12Abdul Muneer <abdulmuneer@gmail.com> abdulmuneer <abdulmuneer@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]13Adam Ginsburg <adam.g.ginsburg@gmail.com> Adam Ginsburg <adam.g.ginsburg@gmail.com>
14Adam Ginsburg <adam.g.ginsburg@gmail.com> Adam Ginsburg <keflavich@gmail.com>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]15Allan Haldane <allan.haldane@gmail.com> ahaldane <ealloc@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]16Albert Jornet Puig <albert.jornet@ic3.cat> jurnix <albert.jornet@ic3.cat>
17Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
18Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
19Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@gmail.com>
20Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@users.noreply.github.com>
21Alexander Belopolsky <abalkin@enlnt.com> Alexander Belopolsky <a@enlnt.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]22Alok Singhal <gandalf013@gmail.com> Alok Singhal <gandalf013@gmail.com>
23Alok Singhal <gandalf013@gmail.com> Alok Singhal <alok@merfinllc.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]24Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]25Anatoly Techtonik <techtonik@gmail.com> anatoly tecktonik <techtonik@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]26Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]27Anne Archibald <peridot.faceted@gmail.com> Anne Archibald <archibald@astron.nl>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]28Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
29Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]30Arun Persaud <apersaud@lbl.gov> Arun Persaud <apersaud@lbl.gov>
31Arun Persaud <apersaud@lbl.gov> Arun Persaud <arun@nubati.net>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]32Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
33Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
34Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]35Bertrand Lefebvre <bertrand.l3f@gmail.com> bertrand <bertrand.l3f@gmail.com>
36Bertrand Lefebvre <bertrand.l3f@gmail.com> Bertrand <bertrand.l3f@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]37Brett R Murphy <bmurphy@enthought.com> brettrmurphy <bmurphy@enthought.com>
38Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@Laptop-3.local>
39Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@laptop.local>
40Carl Kleffner <cmkleffner@gmail.com> carlkl <cmkleffner@gmail.com>
41Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]42Chris Kerr <debdepba@dasganma.tk> Chris Kerr <debdepba@dasganma.tk>
43Chris Kerr <debdepba@dasganma.tk> Chris Kerr <cjk34@cam.ac.uk>
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]44Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]45Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]46Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]47Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]48Daniel <dabi@blazemail.com> Daniel <dabi@blazemail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]49Daniel J Farrell <danieljfarrel@me.com> danieljfarrell <danieljfarrel@me.com>
50Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> Daniel <muellner@localhost.localdomain>
51Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> dmuellner <Daniel Müllner muellner@math.stanford.edu>
52Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
53Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <var.mail.daniel@gmail.com>
54David Huard <david.huard@gmail.com> dhuard <dhuard@localhost>
55David M Cooke <cookedm@localhost> cookedm <cookedm@localhost>
56David Ochoa <ochoadavid@gmail.com> ochoadavid <ochoadavid@gmail.com>
57Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeier <dhomeie@gwdg.de>
58Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeir <derek@astro.phsik.uni-goettingen.de>
59Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homier <derek@astro.physik.uni-goettingen.de>
60Egor Zindy <ezindy@gmail.com> zindy <ezindy@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]61Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@gmail.com>
62Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@linuxlaptop.(none)>
Charles Harris5a8432a2015-08-03 14:51:37[diff] [blame]63Ernest N. Mamikonyan <ernest.mamikonyan@gmail.com> mamikony <ernest.mamikonyan@sig.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]64Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeny.burovskiy@gmail.com>
65Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeni@burovski.me>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]66Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
67Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>
68Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]69Gerrit Holl <g.holl@reading.ac.uk> Gerrit Holl <g.holl@reading.ac.uk>
70Gerrit Holl <gerrit.holl@utoronto.ca> Gerrit Holl <g.holl@reading.ac.uk>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]71Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]72Gopal Singh Meena <gopalmeena94@gmail.com> gopalmeena <gopalmeena94@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]73Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung17@gmail.com>
74Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung@mit.edu>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]75Greg Yang <sorcererofdm@gmail.com> eulerreich <sorcererofdm@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]76Jason Grout <jason-github@creativetrax.com> Jason Grout <jason-github@creativetrax.com>
77Jason Grout <jason-github@creativetrax.com> Jason Grout <jason.grout@drake.edu>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]78Jason King <pizza@netspace.net.au> jason king <pizza@netspace.net.au>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]79Joseph Martinot-Lagarde <contrebasse@gmail.com> Joseph Martinot-Lagarde <contrebasse@gmail.com>
80Joseph Martinot-Lagarde <contrebasse@gmail.com> Joseph Martinot-Lagarde <joseph.martinot-lagarde@onera.fr>
81Julien Lhermitte <jrmlhermitte@gmail.com> Julien Lhermitte <jrmlhermitte@gmail.com>
82Julien Lhermitte <jrmlhermitte@gmail.com> Julien Lhermitte <lhermitte@bnl.gov>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]83Julien Schueller <julien.schueller@gmail.com> jschueller <julien.schueller@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]84Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
85Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
86Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
87Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
88Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
89Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
90Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
91Jarrod Millman <millman@berkeley.edu> Jarrod Millman <jarrod.millman@gmail.com>
92Jay Bourque <jay.bourque@continuum.io> jayvius <jay.bourque@continuum.io>
93Jerome Kelleher <jerome.kelleher@ed.ac.uk> jeromekelleher <jerome.kelleher@ed.ac.uk>
94Johannes Schönberger <hannesschoenberger@gmail.com> Johannes Schönberger <jschoenberger@demuc.de>
95Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <jtaylor.debian@googlemail.com>
96Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <juliantaylor108@googlemail.com>
97Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
98Lars Buitinck <larsmans@gmail.com> Lars Buitinck <l.buitinck@esciencecenter.nl>
99Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]100Luke Zoltan Kelley <lkelley@cfa.harvard.edu> lzkelley <lkelley@cfa.harvard.edu>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]101Mark DePristo <mdepristo@synapdx.com> markdepristo <mdepristo@synapdx.com>
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]102Mark Wiebe <mwwiebe@gmail.com> Mark <mwwiebe@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]103Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@continuum.io>
Matthew Brett8ea667d2012-12-24 08:39:42[diff] [blame]104Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
105Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]106Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
107Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
108Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
109Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]110Michael K. Tran <trankmichael@gmail.com> mtran <trankmichael@gmail.com>
111Michael Behrisch <oss@behrisch.de> behrisch <behrisch@users.sourceforge.net>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]112Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
113Nicolas Scheffer <nicolas.scheffer@sri.com> Nicolas Scheffer <scheffer@speech.sri.com>
114Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
115Pat Miller <patmiller@localhost> patmiller <patmiller@localhost>
116Paul Ivanov <pi@berkeley.edu> Paul Ivanov <paul.ivanov@local>
117Paul Jacobson <hpj3@myuw.net> hpaulj <hpj3@myuw.net>
118Pearu Peterson <pearu.peterson@gmail.com> Pearu Peterson <pearu@pearu-laptop.(none)>
119Peter J Cock <p.j.a.cock@googlemail.com> peterjc <p.j.a.cock@googlemail.com>
120Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
121Pierre GM <pierregmcode@gmail.com> pierregm <pierregmcode@gmail.com>
122Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
123Ralf Gommers <ralf.gommers@gmail.com> Ralf Gommers <ralf.gommers@googlemail.com>
124Ralf Gommers <ralf.gommers@gmail.com> rgommers <ralf.gommers@googlemail.com>
Charles Harris1cb61e82016-03-25 18:42:36[diff] [blame]125Rehas Sachdeva <aquannie@gmail.com> rehassachdeva <aquannie@gmail.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]126Ritta Narita <narittan@gmail.com> RittaNarita <narittan@gmail.com>
127Robert Kern <rkern@enthought.com> Robert Kern <robert.kern@gmail.com>
128Robert LU <robberphex@gmail.com> RobberPhex <robberphex@gmail.com>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]129Ronan Lamy <ronan.lamy@gmail.com> Ronan Lamy <ronan.lamy@gmail.com>
130Ronan Lamy <ronan.lamy@gmail.com> Ronan Lamy <Ronan.Lamy@normalesup.org>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]131Russell Hewett <rhewett@mit.edu> rhewett <rhewett@mit.edu>
132Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com>
133Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com>
134Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com>
135Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net>
136Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.com>
137Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <stefan@sun.ac.za>
Charles Harrisaabd81f2016-01-20 20:46:15[diff] [blame]138Stephan Hoyer <shoyer@gmail.com> Stephan Hoyer <shoyer@gmail.com>
139Stephan Hoyer <shoyer@gmail.com> Stephan Hoyer <shoyer@climate.com>
Charles Harrisddd66c22015-08-02 05:08:47[diff] [blame]140Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
141Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
142Tim Cera <tim@cerazone.net> tim cera <tcera@sjrwmd.com>
143Tom Poole <t.b.poole@gmail.com> tpoole <t.b.poole@gmail.com>
144Travis Oliphant <travis@continuum.io> Travis E. Oliphant <teoliphant@gmail.com>
145Travis Oliphant <travis@continuum.io> Travis Oliphant <oliphant@enthought.com>
146Valentin Haenel <valentin@haenel.co> Valentin Haenel <valentin.haenel@gmx.de>
147Warren Weckesser <warren.weckesser@enthought.com> Warren Weckesser <warren.weckesser@gmail.com>
148Wendell Smith <wendellwsmith@gmail.com> Wendell Smith <wackywendell@gmail.com>
149William Spotz <wfspotz@sandia.gov@localhost> wfspotz@sandia.gov <wfspotz@sandia.gov@localhost>
150Åsmund Hjulstad <ahju@statoil.com> Åsmund Hjulstad <asmund@hjulstad.com>
151Óscar Villellas Guillén <oscar.villellas@continuum.io> ovillellas <oscar.villellas@continuum.io>