aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 216e6183db..5bd41ddec1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,7 @@ Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.
Andy Ling <andy.ling@s-a-m.com> AndyL <andy.ling@s-a-m.com>
Anil Kumar K K <anilkumar911@gmail.com> anilkumar911 <anilkumar911@gmail.com>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
+Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
@@ -106,6 +107,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.
Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
Sumit Kumar Jha <sjha3@ncsu.edu> sjha3 <sjha3@ncsu.edu>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
+Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassau@hotmail.fr>
Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>