diff options
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 9 |
1 files changed, 8 insertions, 1 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> |