aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index d814309d72..ef49ee26c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,15 +26,18 @@ Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
Dave Tapuska <dtapuska@google.com> dave@tapuska.com
David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com>
+Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in>
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>
+Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
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> Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
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>
@@ -107,6 +110,7 @@ Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
Rudra Rugge <rrugge@juniper.net> Rudra Rugge <rudrarugge@gmail.com>
Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
+Sanket Godbole <sanket.godbole@spirent.com> sangodbole <sanket.godbole@spirent.com>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
Shuai Xiao <iamhihi@gmail.com> shuai xiao <iamhihi@gmail.com>