aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap7
-rw-r--r--AUTHORS3
2 files changed, 8 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 0a8c478ed8..a8d4cc1a97 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,14 +16,18 @@ Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com>
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>
+Chris Bontje <cbontje@gmail.com> chrisbontje <cbontje@gmail.com>
Chris Dunlop <chris.dunlop3@gmail.com> cjdunlop
Chris Maynard <Christopher.Maynard@GTECH.COM> <Christopher.Maynard@igt.com>
Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org>
Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de>
+Christoph Schlosser <christoph@schlosser.xyz> Christoph Schlosser <christoph.schlosser@br-automation.com>
Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@gmail.com>
Daniel Tan <BACdaBASpert@optigo.net> BACdaBASpert <BACdaBASpert@optigo.net>
Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden
Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
+Darien Spencer <cusneud@mail.com> DarienSpencer65 <cusneud@mail.com>
+Dario Lombardo <lomato@gmail.com> dario <lomato@gmail.com>
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>
@@ -31,6 +35,7 @@ Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in>
Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Dhiru Kholia <kholia@kth.se> Dhiru Kholia <dhiru.kholia@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
+Dirk Jagdmann <doj@cubic.org> Dirk <doj@cubic.org>
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>
@@ -120,10 +125,12 @@ 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>
+Samiran Saha <ssahasamiran@gmail.com> samsaha <ssahasamiran@gmail.com>
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>
+Simon Zhong <szhong.jnpr@gmail.com> szhong <szhong.jnpr@gmail.com>
Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org>
Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@emulex.com>
Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@endace.com>
diff --git a/AUTHORS b/AUTHORS
index f459520ec4..69aaefa223 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4044,7 +4044,6 @@ Christian Tellefsen <chris-git[AT]tellefsen.net>
Christian Ullrich <chris[AT]chrullrich.net>
Christoph Burger-Scheidlin <mail[AT]christoph.burger-scheidlin.name>
Christoph Jähnigen <nuabaranda[AT]web.de>
-Christoph Schlosser <christoph.schlosser[AT]br-automation.com>
Christoph Schlosser <christoph[AT]schlosser.xyz>
Christopher Kilgour <techie[AT]whiterocker.com>
Chuan He <bupthc[AT]gmail.com>
@@ -4061,7 +4060,7 @@ Daniel Tan <BACdaBASpert[AT]optigo.net>
Daniel Willmann <dwillmann[AT]sysmocom.de>
Daniele Lacamera <daniele.lacamera[AT]technicolor.com>
Daniël van Eeden <wireshark[AT]myname.nl>
-DarienSpencer65 <cusneud[AT]mail.com>
+Darien Spencer <cusneud[AT]mail.com>
Darshan Nevgi <darshan.sn[AT]samsung.com>
Dave Pifke <dave[AT]pifke.org>
Dave Rigby <daver[AT]couchbase.com>