summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-06-05 21:11:51 +0200
committerAnders Broman <a.broman58@gmail.com>2016-06-06 06:23:56 +0000
commitd40b40d0549679f95ca968555e9250122a109fe6 (patch)
tree824fd905e5b261be45e1be025783326340f8975f /AUTHORS
parent57ef06e242dbbce390547d9711f810fc60829219 (diff)
downloadwireshark-d40b40d0549679f95ca968555e9250122a109fe6.tar.gz
Update .mailmap: fix duplicate entry or name typo
Change-Id: I72ad4ba629af55b54c10d5623018aef65a9eac0e Reviewed-on: https://code.wireshark.org/review/15744 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS8
1 files changed, 2 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index 9ab5ec852d..c04a90a85d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3922,7 +3922,7 @@ Robert Long <rlong[AT]sandia.gov>
James Lynch <lynch007[AT]gmail.com>
Chidambaram Arunachalam <carunach[AT]cisco.com>
João Valverde <joao.valverde[AT]tecnico.ulisboa.pt>
-Benoît Canet <benoit@scylladb.com>
+Benoît Canet <benoit[AT]scylladb.com>
@@ -3967,7 +3967,6 @@ Benjamin Coddington <bcodding[AT]redhat.com>
Benjamin Hesmans <benjamin.hesmans[AT]uclouvain.be>
Benjamin Roch <benjamin.roch[AT]tttech.com>
Benoit Grange <benoit.grange[AT]gmail.com>
-Benoît Canet <benoit[AT]scylladb.com>
Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com>
Binh Trinh <beango[AT]gmail.com>
Birol Capa <birol.capa[AT]siemens.com>
@@ -4075,6 +4074,7 @@ Joseph Huffman <jhuffman[AT]codeaurora.org>
Josip Medved <jmedved[AT]jmedved.com>
Juan Jose Martin Carrascosa <juanjo[AT]rti.com>
Juan Matias <jmrepetti[AT]gmail.com>
+Juan Pablo Mendoza <jpablo[AT]gmail.com>
Julien STAUB <atsju2[AT]yahoo.fr>
Jun Wang <sdn_app[AT]163.com>
JustinKu <jiunrong[AT]gmail.com>
@@ -4221,11 +4221,9 @@ Victor Dodon <dodonvictor[AT]gmail.com>
Victor Voronkov <victor.voronkov[AT]gmail.com>
Vik <vkp129+ubuntu[AT]gmail.com>
Vikhyat Umrao <vumrao[AT]redhat.com>
-Vikram Hegde <vikram.h[AT]amsung.com>
Vikram Hegde <vikram.h[AT]samsung.com>
Ville Skyttä <ville.skytta[AT]iki.fi>
Vincent Helfre <vincent.helfre[AT]gmx.net>
-Vincent Helfre <vincenthelfre[AT]googlemail.com>
Vincenzo Reale <smart2128[AT]baslug.org>
Vladimir Kondratiev <qca_vkondrat[AT]qca.qualcomm.com>
Volker Lendecke <vl[AT]samba.org>
@@ -4236,7 +4234,6 @@ Weston Schmidt <weston_schmidt[AT]alumni.purdue.edu>
Xavier Brouckaert <xabrouck[AT]cisco.com>
YFdyh000 <yfdyh000[AT]gmail.com>
Yan Burman <yanb[AT]mellanox.com>
-Yang Luo <hsluoyz[AT]gmail.com>
Yang Luo <hsluoyz[AT]qq.com>
Yann Lejeune <ylejeune[AT]netyl.org>
Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp>
@@ -4245,7 +4242,6 @@ anilkumar911 <anilkumar911[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
dsrsupport <eugene.exarevsky[AT]dsr-company.com>
-jpmendoza <jpablo[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>