X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e112990de34a1d23cc56293558545ad16d1f7dfa..4efcdc1e4b35fbb46a705f163bc5c1745ec342c9:/.mailmap

diff --git a/.mailmap b/.mailmap
index 434bd3974e..bcbe371288 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,5 @@
+# .mailmap file, used by git shortlog
+#
 Khaled Baati <kbaati@realopt-Latitude-E6530>
 Benoît Bimal <bimal@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Laurent Bobelin <lbobelin@mintcar.lip.ens-lyon.fr> <lbobelin@mintcar.imag.fr>
@@ -27,11 +29,14 @@ Pierre-Nicolas Clauss <pierre-nicolas.clauss@loria.fr> <pnclauss@griffon-82.nanc
 Tom Cornebize <tom.cornebize@ensimag.grenoble-inp.fr> <Ezibenroc@users.noreply.github.com>
 Gabriel Corona <gabriel.corona@loria.fr> <coron00b@barbecue.loria.fr>
 Gabriel Corona <gabriel.corona@loria.fr> <gabriel.corona@enst-bretagne.fr>
-Augustin Degomme <augustin.degomme@unibas.ch>
-Augustin Degomme <augustin.degomme@unibas.ch> <augustin.degomme@imag.fr>
-Augustin Degomme <augustin.degomme@unibas.ch> <degomme@debian.localdomain>
-Augustin Degomme <augustin.degomme@unibas.ch> <degomme@idpann.imag.fr>
-Augustin Degomme <augustin.degomme@unibas.ch> <degomme@localhost.localdomain>
+Augustin Degomme <adegomme@gmail.com>
+Augustin Degomme <adegomme@gmail.com> <ad254919@cardamome.intra.cea.fr>
+Augustin Degomme <adegomme@gmail.com> <adegomme@users.noreply.github.com>
+Augustin Degomme <adegomme@gmail.com> <augustin.degomme@imag.fr>
+Augustin Degomme <adegomme@gmail.com> <augustin.degomme@unibas.ch>
+Augustin Degomme <adegomme@gmail.com> <degomme@debian.localdomain>
+Augustin Degomme <adegomme@gmail.com> <degomme@idpann.imag.fr>
+Augustin Degomme <adegomme@gmail.com> <degomme@localhost.localdomain>
 Darina Dimitrova <dimitrov@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Bruno Donassolo <donassbr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Pierre-François Dutot <dutot@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
@@ -71,6 +76,7 @@ El Mehdi Fekari <mido.peace@gmail.com> <coldpeace@48e7efb5-ca39-0410-a469-dd3cf9
 Michael Mercier <michael.mercier@inria.fr>
 Etienne Michon <EtienneM@users.noreply.github.com>
 Pierre Navarro <pierre.navarro@imag.fr>
+Pierre Navarro <pierre.navarro@imag.fr> <Pierre.Navarro@imag.fr>
 Pierre Navarro <pierre.navarro@imag.fr> <navarro@caraja.(none)>
 Pierre Navarro <pierre.navarro@imag.fr> <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Pierre Navarro <pierre.navarro@imag.fr> <pierre@.(none)>
@@ -99,6 +105,7 @@ Lucas M. Schnorr <schnorr@inf.ufrgs.br>
 Lucas M. Schnorr <schnorr@inf.ufrgs.br> <lucas.schnorr@imag.fr>
 Lucas M. Schnorr <schnorr@inf.ufrgs.br> <lucas.schnorr@inf.ufrgs.br>
 Lucas M. Schnorr <schnorr@inf.ufrgs.br> <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
+Luka Stanisic <luka.stanisic@inria.fr> <luka.stanisic@imag.fr>
 Mark Stillwell <marklee@fortawesome.org> <mark.stillwell@ens-lyon.fr>
 Mark Stillwell <marklee@fortawesome.org> <markls@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Mark Stillwell <marklee@fortawesome.org> <mstillwell@griffon-40.nancy.grid5000.fr>
@@ -112,5 +119,6 @@ Ruben Ezequiel Torti Lopez <ruben-ezequiel.torti-lopez@inria.fr>
 Pedro Velho <pedro.velho@gmail.com> <velho@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Pedro Velho <pedro.velho@gmail.com> <velho@mohave.(none)>
 Flavien Vernier <vernier@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
+Matthieu Volat <matthieu.volat@univ-lyon1.fr> <mazhe@alkumuna.eu>
 Steven Whatelse <stevenwhatelse@hotmail.fr>
 Chidambar Zinnoury <illogict@48e7efb5-ca39-0410-a469-dd3cf9ba447f>