From bba2cfb5921653f18d6cedf2800cdc1abf9310af Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Mon, 5 Oct 2015 16:34:57 +0200 Subject: Update the .mailmap file. The update process is as follows: run "git shortlog -s -e" and look for duplicate or missing contributors. --- .mailmap | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 7223b7354..13c71558f 100644 --- a/.mailmap +++ b/.mailmap @@ -9,47 +9,47 @@ ## If you're mentionned here and want to update your information, ## either amend this file and commit it, or contact the coqdev list +Jim Apple jbapple Bruno Barras barras Bruno Barras barras-local Yves Bertot bertot -Yves Bertot Yves Bertot Frédéric Besson fbesson Pierre Boutillier pboutill Pierre Boutillier Pierre Pierre Boutillier Pierre Boutillier Xavier Clerc xclerc Xavier Clerc xclerc -Pierre Corbineau corbinea +Pierre Corbineau corbinea Judicaël Courant courant Pierre Courtieu courtieu -# uncapitalises the email address: -Pierre Courtieu Pierre Courtieu David Delahaye delahaye Maxime Dénès mdenes Daniel De Rauglaudre ddr Olivier Desmettre desmettr Damien Doligez doligez -Jean-Christophe Filliâtre filliatr +Jean-Christophe Filliâtre filliatr +Jean-Christophe Filliâtre Jean-Christophe Filliatre Julien Forest jforest Julien Forest forest Julien Forest jforest +Julien Forest jforest Stéphane Glondu glondu -# corrects accent: Stéphane Glondu Stephane Glondu -Benjamin Grégoire bgregoir -Benjamin Grégoire gregoire +Benjamin Grégoire Benjamin Gregoire +Benjamin Grégoire bgregoir +Benjamin Grégoire gregoire Jason Gross Jason Gross +Jason Gross Jason Gross Vincent Gross vgross Huang Guan-Shieng huang Hugo Herbelin herbelin -# uncapitalises the email address: -Hugo Herbelin Hugo Herbelin Tom Hutchinson thutchin Cezary Kaliszyk cek Florent Kirchner fkirchne Florent Kirchner kirchner +Marc Lasson mlasson Pierre Letouzey letouzey -Assia Mahboubi amahboub +Assia Mahboubi amahboub Evgeny Makarov emakarov Gregory Malecha Gregory Malecha Lionel Elie Mamane lmamane @@ -68,7 +68,7 @@ Christine Paulin mohring ppedrot Loïc Pottier pottier Matthias Puech puech -Yann Régis-Gianas regisgia +Yann Régis-Gianas regisgia Clément Renard clrenard Claudio Sacerdoti Coen sacerdot Vincent Siles vsiles @@ -77,8 +77,7 @@ Matthieu Sozeau msozeau Matthieu Sozeau Arnaud Spiwack aspiwack Enrico Tassi gareuselesinge -# uncapitalizes the email address -Enrico Tassi Enrico Tassi +Enrico Tassi Enrico Tassi Enrico Tassi Enrico Tassi Laurent Théry thery Benjamin Werner werner -- cgit v1.2.3