diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-07-04 13:42:03 +0000 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-08-10 20:46:38 +0000 |
commit | 06ab7f5a4e0643c2baade6ed4c3babc2fd3e2ce0 (patch) | |
tree | 29b0e149a15d749a33b709d25d5c37a1514cfff0 | |
parent | 55dd9b16d5c9f3641bcb236282fb06983df1a5dd (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>
-rw-r--r-- | .mailmap | 9 | ||||
-rw-r--r-- | AUTHORS | 6 |
2 files changed, 10 insertions, 5 deletions
@@ -9,14 +9,17 @@ 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> Anish <anish@chelsio.com> Anish Bhatt <anish@gatech.edu> +Balint Reczey <balint@balintreczey.hu> Balint Reczey <balint.reczey@canonical.com> Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com> Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org> Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru> Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com> Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com> Cal Turney <cturney@charter.net> cturney <cturney@charter.net> +Cedric Izoard <cedric.izoard@ceva-dsp.com> Cedric Izoard <cedric.izoard@rivierawaves.com> Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com> Chris Bontje <cbontje@gmail.com> chrisbontje <cbontje@gmail.com> +Chris Brandson <chris.brandson@gmail.com> Chris Brandson <cjb@exegin.com> Chris Dunlop <chris.dunlop3@gmail.com> cjdunlop Chris Maynard <Christopher.Maynard@GTECH.COM> <Christopher.Maynard@igt.com> Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org> @@ -71,7 +74,7 @@ Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com> Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com> João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt> John Miner <optommp@gmail.com> John <optommp@gmail.com> -Jonathan Muñoz <jonathan.munoz@inria.fr> +Jonathan Muñoz <jonathan.munoz@inria.fr> Jonathan Munoz <jonathan.munoz@inria.fr> 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> @@ -80,11 +83,14 @@ 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> +Kasper Deng <kasper.deng@ericsson.com> KasperDeng <kasper.deng@ericsson.com> Krishna Chaitanya <chaitanya.mgit@gmail.com> tkc <chaitanya.mgit@gmail.com> Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at> Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.com> Marcel Essig <marcel.essig@gmx.de> <essig.marcel@gmail.com> Marian Ďurkovič <md@bts.sk> Marian Durkovic +Marius Paliga <marius.paliga@gmail.com> Marius <mareko.paliga@gmail.com> +Marius Paliga <marius.paliga@gmail.com> Marius Paliga <mareko.paliga@gmail.com> Mark Phillips <mark.s.phillips@outlook.com> Mark Phillips <mark.phil@samsung.com> Mark Phillips <mark.s.phillips@outlook.com> MarkPhillips <mark.s.phillips@outlook.com> Martin Kaiser <wireshark@kaiser.cx> <martin.kaiser@paytec.ch> @@ -157,5 +163,6 @@ Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com> Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com> Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com> Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com> +Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp> Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> <yatch@isl.rdc.toshiba.co.jp> Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com> @@ -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> |