aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-06-26 18:54:54 +0200
committerAnders Broman <a.broman58@gmail.com>2016-06-27 06:53:11 +0000
commit76ae2d9721b870937a92c97328f6f316ebac5f13 (patch)
tree7f24b6a7673157fed87eeffc00d70955aba481b4 /.mailmap
parent148d5860a142a88d4ce355dfeba2a763b900a4b4 (diff)
AUTHORS: fix duplicate / wrong name entry
Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11 Reviewed-on: https://code.wireshark.org/review/16149 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: David Zoller <zollerd@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5705dd3912..1b348072bf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ 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>
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>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
@@ -90,6 +91,7 @@ Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
Robert Cragie <robert.cragie@gmail.com> Robert Cragie <robert.cragie@arm.com>
Robert Grange <robionekenobi@bluewin.ch> robioneknobi
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>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>