[commit: ghc] master: Update .mailmap (cc0abfa)

git at git.haskell.org git at git.haskell.org
Mon Jan 2 22:15:14 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cc0abfa40b00b3b3ad4f4cf31b060026d677488a/ghc

>---------------------------------------------------------------

commit cc0abfa40b00b3b3ad4f4cf31b060026d677488a
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Mon Jan 2 22:14:59 2017 +0000

    Update .mailmap


>---------------------------------------------------------------

cc0abfa40b00b3b3ad4f4cf31b060026d677488a
 .mailmap | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 4da118d..c542bab 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,7 @@ Dana N. Xu              <na.xu at inria.fr>                    nx <unknown>
 Daniel Fischer          <daniel.is.fischer at googlemail.com>  <daniel.is.fischer at web.de>
 Daniel Franke           <df at dfranke.us>                     df at dfranke.us <unknown>
 Daniel Rogers           <daniel at phasevelocity.org>          daniel at phasevelocity.org <unknown>
+Darshan Kapashi         <darshan at fb.com>                    <darshankapashi at gmail.com>
 David Feuer             <david.feuer at gmail.com>             <David.Feuer at gmail.com>
 David Himmelstrup       <lemmih at gmail.com>                  # http://www.haskellers.com/user/Lemmih
 David M Peixotto        <dmp at rice.edu>                      dmp at rice.edu <unknown>
@@ -95,6 +96,7 @@ Duncan Coutts           <duncan at well-typed.com>             <duncan.coutts at worc.
 Duncan Coutts           <duncan at well-typed.com>             <duncan at community.haskell.org>
 Duncan Coutts           <duncan at well-typed.com>             <duncan at haskell.org>
 Edward Z. Yang          <ezyang at cs.stanford.edu>            <ezyang at mit.edu>
+Erik de Castro Lopo     <erik.decastrolopo at ambiata.com>     <erikd at mega-nerd.com>
 Evan Hauck              <khyperia at live.com>
 Fumiaki Kinoshita       <fumiexcel at gmail.com>
 Gabor Pali              <pali.gabor at gmail.com>              <pgj at FreeBSD.org>
@@ -137,6 +139,7 @@ Jose Pedro Magalhaes    <jpm at cs.ox.ac.uk>                   <dreixel at gmail.com>
 Jose Pedro Magalhaes    <jpm at cs.ox.ac.uk>                   <jpm at cs.uu.nl>
 Jose Pedro Magalhaes    <jpm at cs.ox.ac.uk>                   jpm at cs.uu.nl <unknown>
 Josef Svenningsson      <josef.svenningsson at gmail.com>      josefs <unknown>
+Josh Price              <joshprice247+git at gmail.com>        <thepig247 at gmail.com>
 Jost Berthold           <jb.diku at gmail.com>                 <berthold at mathematik.uni-marburg.de>
 Jost Berthold           <jb.diku at gmail.com>                 berthold at mathematik.uni-marburg.de <unknown>
 Juan J. Quintela        <quintela at fi.udc.es>                quintela <unknown>
@@ -180,6 +183,7 @@ Michael D. Adams        <t-madams at microsoft.com>            <adamsmd at cs.indiana.
 Michael Weber           <michaelw at debian.org>               michaelw <unknown>
 Mike Thomas             <mthomas at gil.com.au>                mthomas <unknown>
 Mikolaj Konarski        <mikolaj at well-typed.com>            <mikolaj.konarski at gmail.com>
+Moritz Angermann        <moritz.angermann at gmail.com>        <moritz at lichtzwerge.de>
 Nathan Huesken          <nathan.huesken at posteo.de>
 Neil Mitchell           <ndmitchell at gmail.com>              <http://www.cs.york.ac.uk/~ndm/>
 Neil Mitchell           <ndmitchell at gmail.com>              Neil Mitchell <unknown>
@@ -201,8 +205,8 @@ Peter Wortmann          <scpmw at leeds.ac.uk>                 scpmw at leeds.ac.uk <u
 Ralf Laemmel            <softlang at uni-koblenz.de>           ralf <unknown> # https://ghc.haskell.org/trac/ghc/wiki/TeamGHC
 Ravi Nanavati           <ravi at bluespec.com>                 # Commit 70c044.
 Reuben Thomas           <rrt at sc3d.org>                      rrt <unknown>
-Richard Eisenberg       <rae at cs.brynmawrn.edu>              <eir at seas.upenn.edu>
-Richard Eisenberg       <eir at cis.upenn.edu>                 <rae at cs.brynmawr.edu>
+Richard Eisenberg       <rae at cs.brynmawr.edu>               <eir at seas.upenn.edu>
+Richard Eisenberg       <rae at cs.brynmawr.edu>               <eir at cis.upenn.edu>
 Rob Ennals              <rob at ennals.org>                    rje <unknown> # SPJ's student (rje33 at cam.ac.uk)
 Roman Leshchinskiy      <rl at cse.unsw.edu.au>                rl at cse.unsw.edu.au <unknown>
 Ross Paterson           <ross at soi.city.ac.uk>               ross <unknown>
@@ -212,6 +216,7 @@ Ryan Scott              <ryan.gl.scott at gmail.com>           <ryan.gl.scott at ku.ed
 Sam Anklesaria          <amsay at amsay.net>
 Sam Anklesaria          <amsay at amsay.net>                   amsay at amsay.net <unknown>
 Sean Seefried           <sean.seefried at gmail.com>           sseefried <unknown>
+Sean Innes              <sean.r.innes at googlemail.com>
 Sergei Trofimovich      <slyfox at gentoo.org>                 <siarheit at google.com>
 Sergei Trofimovich      <slyfox at gentoo.org>                 <slyfox at gentoo.org>
 Sergei Trofimovich      <slyfox at gentoo.org>                 <slyfox at community.haskell.org>
@@ -246,8 +251,10 @@ Sungwoo Park            <gla at postech.ac.kr>                 gla <unknown> # http
 Sven Panne              <sven.panne at aedion.de>              panne <unknown>
 Sven Panne              <sven.panne at aedion.de>              sven.panne at aedion.de <unknown>
 Sylvain Henry           <hsyl20 at gmail.com>
+Sylvain Henry           <hsyl20 at gmail.com>                  <sylvain at haskus.fr>
 Sébastien Carlier       <sebc at posse42.net>                  sebc <unknown>
 Takano Akio             <tak at anoak.io>                      <aljee at hyper.cx>
+Thijs Alkemade          <me at thijsalkema.de>                 <thijsalkemade at gmail.com>
 Thorkil Naur            <naur at post11.tele.dk>               naur at post11.tele.dk <unknown>
 Tibor Erdesz            <erdeszt at gmail.com>
 Tim Chevalier           <chevalier at alum.wellesley.edu>



More information about the ghc-commits mailing list