aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 06e1568083..f47ebcdce7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,6 +51,7 @@ 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>
+Dylan Ulis <daulis0@gmail.com> D. Ulis <daulis0@gmail.com>
Ed Beroset <beroset@ieee.org> Ed Beroset <beroset@mindspring.com>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
@@ -78,6 +79,7 @@ Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de>
Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@localhost>
Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@MacBookIrene.local>
Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org>
+Jaap Keuter <jaap.keuter@xs4all.nl> Jaap Keuter <jkeuter@aimvalley.nl>
Jaime Caamaño Ruiz <jcaamano@suse.com> Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl>
Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com>
@@ -178,6 +180,7 @@ Tengfei Chang <tengfei.chang@inria.fr> tchang <tengfei.chang@inria.fr>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassau@hotmail.fr>
Uli Heilmeier <uh@heilmeier.eu> Uli Heilmeier <openid@heilmeier.eu>
+Vadim Fedorenko <vadimjunk@gmail.com> Vadim Fedorenko <junk@yandex-team.ru>
Vasil Velichkov <vvvelichkov@gmail.com> Vasil Velichckov <vvvelichkov@gmail.com>
Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>