[commit: ghc] master: Update .mailmap (c00f051)
git at git.haskell.org
git at git.haskell.org
Sat May 23 21:05:56 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/c00f051ba187ce3048779a658a96de7ec9f4fe2f/ghc
>---------------------------------------------------------------
commit c00f051ba187ce3048779a658a96de7ec9f4fe2f
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Wed May 20 00:06:02 2015 +0200
Update .mailmap
[skip ci]
>---------------------------------------------------------------
c00f051ba187ce3048779a658a96de7ec9f4fe2f
.mailmap | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.mailmap b/.mailmap
index 552920d..ec555d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,8 @@
Aaron Tomb <atomb at galois.com> <atomb at soe.ucsc.edu>
Alastair Reid <alastair at reid-consulting-uk.ltd.uk> areid <unknown>
Alastair Reid <alastair at reid-consulting-uk.ltd.uk> reid <unknown>
+Alexander Lukyanov <alex.dontexist at gmail.com> # Ticket #9360.
+Alexander Vershilov <alexander.vershilov at gmail.com> <alexander.vershilov at tweag.io>
Alexey Rodriguez <mrchebas at gmail.com>
Alexey Rodriguez <mrchebas at gmail.com> mrchebas at gmail.com <unknown>
Andrew Farmer <afarmer at ittc.ku.edu> <anfarmer at ku.edu>
@@ -30,6 +32,7 @@ Bas van Dijk <v.dijk.bas at gmail.com> v.dijk.bas at gmail.com
Ben Chan <usrbincc at yahoo.com> # See Note [usrbincc].
Ben Gamari <bgamari.foss at gmail.com> <ben at panda.(none)>
Ben Gamari <bgamari.foss at gmail.com> <ben at panda1.milkyway>
+Ben Gamari <bgamari.foss at gmail.com> <ben at smart-cactus.org>
Ben Lippmeier <benl at ouroborus.net>
Ben Lippmeier <benl at ouroborus.net> <Ben.Lippmeier at anu.edu.au>
Ben Lippmeier <benl at ouroborus.net> Ben.Lippmeier.anu.edu.au <unknown>
@@ -48,6 +51,7 @@ Cain Norris <ghc at cainnorris.net> ghc at cainnorris.net <
Chris Catalfo <foxnorth at gmail.com> # https://github.com/ccatalfo
Chris Rodrigues <red5_2 at hotmail.com> red5_2 at hotmail.com <unknown>
Chris Smith <cdsmith at twu.net> cdsmith at twu.net <unknown>
+Christiaan Baaij <christiaan.baaij at gmail.com>
Christoph Bauer <ich at christoph-bauer.net> ich at christoph-bauer.net <unknown>
Claus Reinke <claus.reinke at talk21.com>
Claus Reinke <claus.reinke at talk21.com> claus.reinke at talk21.com <unknown>
@@ -122,6 +126,7 @@ John Dias <dias at cs.tufts.edu> dias at eecs.harvard.ed
John Dias <dias at cs.tufts.edu> dias at eecs.tufts.edu <unknown>
John McCall <rjmccall at gmail.com> rjmccall at gmail.com <unknown>
Jon Fairbairn <jon.fairbairn at cl.cam.ac.uk> jon.fairbairn at cl.cam.ac.uk <unknown>
+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>
@@ -155,7 +160,9 @@ Malcolm Wallace <Malcolm.Wallace at cs.york.ac.uk> malcolm <unknown>
Manuel M T Chakravarty <chak at cse.unsw.edu.au> chak <unknown>
Marc Weber <marco-oweber at gmx.de> marco-oweber at gmx.de <unknown>
Marcin 'Qrczak' Kowalczyk <qrczak at knm.org.pl> qrczak <unknown>
+Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>
Marco Túlio Gontijo e Silva <marcot at marcot.eti.br> <marcot at debian.org>
+Marios Titas <redneb at gmx.com> <geopoul at gmail.com>
Matt Chapman <matthewc at cse.unsw.edu.au> matthewc <unknown>
Matthias Kilian <kili at outback.escape.de> kili at outback.escape.de <unknown>
Michael D. Adams <t-madams at microsoft.com> <adamsmd at cs.indiana.edu>
@@ -190,6 +197,7 @@ Ryan Lortie <desrt at desrt.ca> desrt <unknown>
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>
+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>
Sergei Trofimovich <slyfox at gentoo.org> <slyfox at inbox.ru>
@@ -200,6 +208,7 @@ Simon Hengel <sol at typeful.net> <simon.hengel at wiktor
Simon Marlow <marlowsd at gmail.com> <simonmar-work at simonmar-laptop.(none)>
Simon Marlow <marlowsd at gmail.com> <simonmar at microsoft.com>
Simon Marlow <marlowsd at gmail.com> <simonmarhaskell at gmail.com>
+Simon Marlow <marlowsd at gmail.com> <smarlow at fb.com>
Simon Marlow <marlowsd at gmail.com> simonm <unknown>
Simon Marlow <marlowsd at gmail.com> simonmar <unknown>
Simon Marlow <marlowsd at gmail.com> simonmar at microsoft.com <unknown>
@@ -239,6 +248,8 @@ Wolfgang Thaller <wolfgang.thaller at gmx.net> wolfgang <unknown>
Wolfgang Thaller <wolfgang.thaller at gmx.net> wolfgang.thaller at gmx.net <unknown>
Yorick Laupa <yo.eight at gmail.com> # https://github.com/yoeight
Yuri de Wit <admin at rodlogic.net> # Commit 37d64a.
+Yusuke Matsushita <y.skm24t at gmail.com> # https://github.com/Kinokkory
+Zejun Wu <watashi at watashi.ws> <zejun.wu at gmail.com>
gwern <gwern0 at gmail.com> gwern0 at gmail.com <unknown> # Uses this name online.
shelarcy <shelarcy at gmail.com> # Uses this name online.
Ömer Sinan Ağacan <omeragacan at gmail.com> # https://github.com/osa1
More information about the ghc-commits
mailing list