aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-07-04 13:42:03 +0000
committerAnders Broman <a.broman58@gmail.com>2017-08-10 20:46:38 +0000
commit06ab7f5a4e0643c2baade6ed4c3babc2fd3e2ce0 (patch)
tree29b0e149a15d749a33b709d25d5c37a1514cfff0 /AUTHORS
parent55dd9b16d5c9f3641bcb236282fb06983df1a5dd (diff)
.mailmap: update (of July and Mid-August)
Change-Id: I53c3dab6f83cce138a06bb95f1f3bacec681a2a2 Reviewed-on: https://code.wireshark.org/review/23021 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS6
1 files changed, 2 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index d7e0e43b5c..c899177241 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4031,14 +4031,12 @@ Camille Guérin <guerincamille56[AT]gmail.com>
Carlos Velasco <carlos.velasco[AT]nimastelecom.com>
Cathy Yang <cathy.y.yang[AT]ericsson.com>
Cedric Izoard <cedric.izoard[AT]ceva-dsp.com>
-Cedric Izoard <cedric.izoard[AT]rivierawaves.com>
Cenk Gündoğan <cnkgndgn[AT]gmail.com>
Chaitanya T K <chaitanya.mgit[AT]gmail.com>
Charles Nepveu <charles.nepveu[AT]verint.com>
Charlie Lenahan <clenahan[AT]sonicbison.com>
Chema Gonzalez <chemag[AT]gmail.com>
Chris Brandson <chris.brandson[AT]gmail.com>
-Chris Brandson <cjb[AT]exegin.com>
Chris Dunlop <chris.dunlop3[AT]gmail.com>
Chris Wills <xenkrs[AT]outlook.com>
Christian Ambach <ambi[AT]samba.org>
@@ -4197,11 +4195,12 @@ Juan Pablo Mendoza <jpablo[AT]gmail.com>
Julian Cable <julian.cable[AT]yahoo.com>
Julien STAUB <atsju2[AT]yahoo.fr>
Jun Wang <sdn_app[AT]163.com>
+Junpei Yoshino <junpei.yoshino[AT]gmail.com>
Justin Helgesen <justinhelgesen[AT]gmail.com>
JustinKu <jiunrong[AT]gmail.com>
Jérôme LAFORGE <jerome.laforge[AT]gmail.com>
Kary Rogers <kary.rogers[AT]gmail.com>
-KasperDeng <kasper.deng[AT]ericsson.com>
+Kasper Deng <kasper.deng[AT]ericsson.com>
Kenneth Soerensen <knnthsrnsn[AT]gmail.com>
Kenny Root <kenny[AT]the-b.org>
Kevin Bracey <kevin.bracey[AT]arm.com>
@@ -4232,7 +4231,6 @@ Marcelo Ricardo Leitner <marcelo.leitner[AT]gmail.com>
Marcin Rokicki <marcin.rokicki[AT]gmail.com>
Marian Ďurkovič <md[AT]bts.sk>
Marie Janssen <jamuraa[AT]google.com>
-Marius <mareko.paliga[AT]gmail.com>
Marius Paliga <marius.paliga[AT]gmail.com>
Mark Cunningham <launchpad[AT]markcunningham.ie>
Mark Phillips <mark.s.phillips[AT]outlook.com>