aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-05-27 21:10:30 +0200
committerAnders Broman <a.broman58@gmail.com>2018-05-30 08:17:06 +0000
commit6bcae9d34c8e8baf70010f39aeaee69d86bfb8dc (patch)
tree332f3a45793243854116caa2de87141d7b8a6be5 /.mailmap
parent2cb6056388404130c3590e2871d2fe8ea23d3710 (diff)
.mailmap: update of May (2018)
Change-Id: Id7ea1cde7d08f17a55f7426e1fced00445bd07e8 Reviewed-on: https://code.wireshark.org/review/27852 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Dirk Roemmen <dro@cslab.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 4a8fb57bb5..0050bae7ea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -46,6 +46,7 @@ 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>
+Dirk Römmen <dirk.roemmen@cslab.de> Dirk Römmen <dro@cslab.de>
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>
@@ -121,6 +122,7 @@ Michał Łabędzki <michal.labedzki@wireshark.org> Michal Labedzki <michal.labed
Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.com>
+Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@sony.com>
Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
@@ -170,6 +172,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>
Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com>
Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
Sumit Kumar Jha <sjha3@ncsu.edu> sjha3 <sjha3@ncsu.edu>
+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>