aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-10-24 09:11:06 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-02 16:13:28 +0000
commitd3e0ce42074bb1a662dbe9b79fb4a1191988ac48 (patch)
tree6f4fc383a3edcd904d21ad5e01a9db1587c4f13d /.mailmap
parent27bd013970476b21ab55ff67eda88cd3228860fe (diff)
Update .mailmap
Change-Id: I9962ced39ce3fd31cff446a99ba1c0b6ebfb1bbf Reviewed-on: https://code.wireshark.org/review/18596 Reviewed-by: Erik de Jong <erikdejong@gmail.com> Reviewed-by: Anish Bhatt <anish@gatech.edu> Reviewed-by: Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Franklin Mathieu <snaipe@diacritic.io> Reviewed-by: Boris Bochkaryov <Boris-Bochkaryov@yandex.ru> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 968f5cd086..d814309d72 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,8 +8,10 @@ Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com>
Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com>
Andy Ling <andy.ling@s-a-m.com> AndyL <andy.ling@s-a-m.com>
Anil Kumar K K <anilkumar911@gmail.com> anilkumar911 <anilkumar911@gmail.com>
+Anish <anish@chelsio.com> Anish Bhatt <anish@gatech.edu>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org>
+Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
@@ -28,9 +30,12 @@ Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
+Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
Eugene Exarevsky <eugene.exarevsky@dsr-company.com> dsrsupport <eugene.exarevsky@dsr-company.com>
Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com>
+Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> franciscojavier.sanchezroselly <franciscojavier.sanchezroselly@ujaen.es>
+Franklin Mathieu <franklinmathieu@gmail.com> Snaipe <franklinmathieu@gmail.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
Gloria Pozuelo <gloria.pozuelo@bics.com> glores <gloria.pozuelo@bics.com>
@@ -80,6 +85,7 @@ Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.com>
+Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Moshe Kaplan <me@moshekaplan.com> moshekaplan <me@moshekaplan.com>