aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap3
-rw-r--r--AUTHORS4
2 files changed, 4 insertions, 3 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>
diff --git a/AUTHORS b/AUTHORS
index 1b08ca297f..ca7efa2e5f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4111,7 +4111,6 @@ Didier Arenzana <darenzana[AT]yahoo.fr>
Diederik de Groot <ddegroot[AT]talon.nl>
Dirk Eibach <dirk.eibach[AT]gdsys.cc>
Dirk Römmen <dirk.roemmen[AT]cslab.de>
-Dirk Römmen <dro[AT]cslab.de>
Dirk Weise <code[AT]dirk-weise.de>
Dmitry Bravikov <dmitry[AT]bravikov.pro>
Dmitry Lazurkin <dilaz03[AT]gmail.com>
@@ -4325,7 +4324,6 @@ Michalis Kapsalakis <kapsalis1989[AT]gmail.com>
Michał Skalski <mskalski13[AT]gmail.com>
Michele Baldessari <michele[AT]acksyn.org>
Mikael Kanstrup <mikael.kanstrup[AT]gmail.com>
-Mikael Kanstrup <mikael.kanstrup[AT]sony.com>
Mike Frysinger <vapier[AT]chromium.org>
Mike Gerschefske <msgersch2[AT]gmail.com>
Mike Lugo <mlugo.apx[AT]gmail.com>
@@ -4469,6 +4467,7 @@ T. Scholz <scholzt234[AT]googlemail.com>
Tadeusz Struk <tadeusz.struk[AT]intel.com>
Taisuke Sasaki <taisasak[AT]cisco.com>
Tatsuhiro Tsujikawa <tatsuhiro.t[AT]gmail.com>
+Tengfei Chang <tengfei.chang[AT]inria.fr>
Thibault Gerondal <github[AT]tycale.be>
Thies Moeller <thies.moeller[AT]baslerweb.com>
Thomas Chen <funorpain[AT]gmail.com>
@@ -4534,7 +4533,6 @@ cheloftus <cheloftus[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
shqking <shqking[AT]gmail.com>
-tchang <tengfei.chang[AT]inria.fr>
Éric Piel <piel[AT]delmic.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>