aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-29 12:22:49 +0200
committerMichael Mann <mmann78@netscape.net>2016-10-07 11:42:30 +0000
commit5b3dcb671f37ff635be47f778b6985a21163e5d6 (patch)
treee9ba699b2871e1be8eebe589f21215735f7a296b /.mailmap
parent66433787d0071d02e036cf04f06eb34accce0f67 (diff)
.mailmap: fix typo
Change-Id: I8ee371ab99397c00293372102c73805108845738 Reviewed-on: https://code.wireshark.org/review/17979 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 5 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 5bd41ddec1..ae80067301 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,9 +18,10 @@ 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>
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>
-Dave Tapuska <dtapuska@google.com> dave@tapuska.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>
Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
@@ -72,6 +73,7 @@ Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens
Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens <martin.tibensky@alcatel-lucent.com>
Martin Tibenský <martin.tibensky@alcatel-lucent.com> <tibensky233@gmail.com>
Matthieu Coudron <matthieu.coudron@lip6.fr> <mattator@gmail.com>
+Matthieu Texier <matthieu@texier.tv> Matt Texier <matthieu@texier.tv>
Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com>
Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
@@ -81,6 +83,7 @@ Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.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>
+Olga Kornievskaia <kolga@netapp.com> Olga Kornievskaia <olga.kornievskaia@gmail.com>
Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com>
Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
@@ -100,6 +103,7 @@ Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
+Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org>
Stephen Donnelly <stephen.donnelly@emulex.com> sfd
Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com>
Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>