aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorThéo Zimmermann2021-03-05 15:04:09 +0100
committerThéo Zimmermann2021-03-05 15:12:08 +0100
commit4927211d7139730fdd8cfe1319b03c11c1659639 (patch)
treeddf5d9afb341f54908728a4ab740c2fe2258a369 /.mailmap
parentafa4882102d627ce5be6821f591f3bf42fe74324 (diff)
Fix the .mailmap.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 5 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 6474a9d164..c30a4298e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,7 @@ Yves Bertot <yves.bertot@inria.fr> Yves Bertot <bertot@inria.fr>
Yves Bertot <yves.bertot@inria.fr> Yves Bertot <Yves.Bertot@inria.fr>
Yves Bertot <yves.bertot@inria.fr> Yves Bertot <bertot@nardis.inria.fr>
Frédéric Besson <frederic.besson@inria.fr> fbesson <fbesson@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Frédéric Besson <frederic.besson@inria.fr> BESSON Frederic <frederic.besson@inria.fr>
Siddharth Bhat <siddu.druid@gmail.com> Siddharth <siddu.druid@gmail.com>
Lasse Blaauwbroek <lasse@blaauwbroek.eu> Lasse Blaauwbroek <lasse@lasse-work.localdomain>
Simon Boulier <simon.boulier@ens-rennes.fr> SimonBoulier <simon.boulier@ens-rennes.fr>
@@ -72,6 +73,7 @@ Vincent Gross <vgross@gforge> vgross <vgross@85f007b7-540e-
Huang Guan-Shieng <huang@gforge> huang <huang@85f007b7-540e-0410-9357-904b9bb8a0f7>
Hugo Herbelin <Hugo.Herbelin@inria.fr> herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
Hugo Herbelin <Hugo.Herbelin@inria.fr> Hugo Herbelin <herbelin@users.noreply.github.com>
+Wolf Honore <wolfhonore@gmail.com> whonore <wolfhonore@gmail.com>
Jasper Hugunin <jasperh@cs.washington.edu> Jasper Hugunin <jasper@hashplex.com>
Tom Hutchinson <thutchin@gforge> thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7>
Cezary Kaliszyk <cek@gforge> cek <cek@85f007b7-540e-0410-9357-904b9bb8a0f7>
@@ -91,7 +93,6 @@ Larry Darryl Lee Jr. <llee454@gmail.com> llee454@gmail.com <llee454@gm
Xavier Leroy <xavier.leroy@college-de-france.fr> Xavier Leroy <xavier.leroy@inria.fr>
Pierre Letouzey <pierre.letouzey@inria.fr> letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>
Pierre Letouzey <pierre.letouzey@inria.fr> letouzey <pierre.letouzey@inria.fr>
-Xia Li-yao <lysxia@gmail.com> Lysxia <lysxia@gmail.com>
Yishuai Li <yishuai@cis.upenn.edu> Yishuai Li <yishuai@upenn.edu>
Assia Mahboubi <assia.mahboubi@inria.fr> amahboub <amahboub@85f007b7-540e-0410-9357-904b9bb8a0f7>
Kenji Maillard <kenji.maillard@inria.fr> Kenji Maillard <kenji@maillard.blue>
@@ -154,6 +155,9 @@ Laurent Théry <laurent.thery@inria.fr> Laurent Théry <thery@sophia
Laurent Théry <laurent.thery@inria.fr> thery <Laurent.Thery@inria.fr>
Anton Trunov <anton.a.trunov@gmail.com> Anton Trunov <anton.trunov@imdea.org>
Benjamin Werner <werner@gforge> werner <werner@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Li-yao Xia <lysxia@gmail.com> Lysxia <lysxia@gmail.com>
+Li-yao Xia <lysxia@gmail.com> Xia Li-yao <lysxia@gmail.com>
+Li-yao Xia <lysxia@gmail.com> Xia Li-yao <Lysxia@users.noreply.github.com>
Wang Zhuyang <hawnzug@gmail.com> hawnzug <hawnzug@gmail.com>
Beta Ziliani <beta@mpi-sws.org> Beta Ziliani <bziliani@famaf.unc.edu.ar>
Beta Ziliani <beta@mpi-sws.org> beta <beta@mpi-sws.org>