aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-06-15 11:20:48 +0000
committerAnders Broman <a.broman58@gmail.com>2018-06-25 14:18:19 +0000
commit336b56b3fce850ba8ac006a2509edbed4e3d440e (patch)
tree001740f8907abb347b557be9feb47dc5eeaace37 /.mailmap
parent87973bf516432756f6948e969dbe9d6aa8a27017 (diff)
.mailmap: update of June (2018)
Change-Id: I5dbebce0dd27c6f6867db61e6b0b0aa6b0d3e36f Reviewed-on: https://code.wireshark.org/review/28285 Reviewed-by: Disha <ddaniel@empirix.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 0050bae7ea..06e1568083 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,7 @@ Dario Lombardo <lomato@gmail.com> dario <lomato@gmail.com>
Dave Tapuska <dtapuska@google.com> dave@tapuska.com
David Aggeler <david_aggeler@yahoo.com> david-aggeler <david_aggeler@yahoo.com>
David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
+David Bastiani <daveb64@yahoo.com>Dave B <daveb64@yahoo.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>
@@ -47,6 +48,7 @@ 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>
Dirk Römmen <dirk.roemmen@cslab.de> Dirk Römmen <dro@cslab.de>
+Disha Daniel <ddaniel@empirix.com> dishadaniel <ddaniel@empirix.com>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
Ed Beroset <beroset@ieee.org> Ed Beroset <beroset@mindspring.com>