aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-03 22:01:23 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-04 20:17:49 +0000
commitaf35e894c0d6377c14a9c89a1eb47fef1364b1b8 (patch)
treee2e5ce10437e25abbd6801c5d76e44bcd10ea925 /.mailmap
parent2fbf6113227e75e1c581a1cd1b63fbab4e22d037 (diff)
.mailmap: Update some name...
Change-Id: I755010e59d33bc771a3be06bd1f6da1bcd81d836 Reviewed-on: https://code.wireshark.org/review/16267 Reviewed-by: Eugene Exarevsky <eugene.exarevsky@dsr-company.com> Reviewed-by: Anil Kumar K K <anilkumar911@gmail.com> Reviewed-by: Jose Rubio <joserubiovidales@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1b348072bf..216e6183db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net>
Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com>
Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com>
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>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
@@ -25,6 +26,7 @@ Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
+Eugene Exarevsky <eugene.exarevsky@dsr-company.com> dsrsupport <eugene.exarevsky@dsr-company.com>
Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
@@ -53,6 +55,7 @@ Jorge Power <jpower@rsscorp.org> jorge power
Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de>
Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de>
Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
+Jose Rubio <joserubiovidales@gmail.com> clairvoyant <joserubiovidales@gmail.com>
Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com>
Juan Pablo Mendoza <jpablo@gmail.com> jpmendoza <jpablo@gmail.com>
Kary Rogers <kary.rogers@gmail.com> karyrogers <kary.rogers@gmail.com>
@@ -101,6 +104,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com>
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>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>