osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update .mailmap 

Change-Id: I9962ced39ce3fd31cff446a99ba1c0b6ebfb1bbf
Reviewed-on: https://code.wireshark.org/review/18596
Reviewed-by: Erik de Jong <erikdejong@gmail.com>
Reviewed-by: Anish Bhatt <anish@gatech.edu>
Reviewed-by: Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es>
Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com>
Reviewed-by: Franklin Mathieu <snaipe@diacritic.io>
Reviewed-by: Boris Bochkaryov <Boris-Bochkaryov@yandex.ru>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Alexis La Goutte 2016-10-24 09:11:06 +02:00
parent 27bd013970
commit d3e0ce4207
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.mailmap
View File

@ -8,8 +8,10 @@ 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>
Anish <anish@chelsio.com> Anish Bhatt <anish@gatech.edu>
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>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
@ -28,9 +30,12 @@ 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>
Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
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>
Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> franciscojavier.sanchezroselly <franciscojavier.sanchezroselly@ujaen.es>
Franklin Mathieu <franklinmathieu@gmail.com> Snaipe <franklinmathieu@gmail.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
Gloria Pozuelo <gloria.pozuelo@bics.com> glores <gloria.pozuelo@bics.com>
@ -80,6 +85,7 @@ Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.com>
Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Moshe Kaplan <me@moshekaplan.com> moshekaplan <me@moshekaplan.com>

10
AUTHORS
View File

@ -3970,7 +3970,6 @@ Andrew Hoag <Andrew.Hoag[AT]aireon.com>
Andy Ling <Andy.Ling[AT]quantel.com>
Andy Ling <andy.ling[AT]s-a-m.com>
Anil Kumar K K <anilkumar911[AT]gmail.com>
Anish Bhatt <anish[AT]gatech.edu>
Anndy Ke <anndymaktub[AT]yahoo.com.tw>
Anthony Coddington <anthony.coddington[AT]endace.com>
Anton Thomasson <anton.thomasson[AT]ericsson.com>
@ -3992,6 +3991,7 @@ Benoit Grange <benoit.grange[AT]gmail.com>
Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com>
Binh Trinh <beango[AT]gmail.com>
Birol Capa <birol.capa[AT]siemens.com>
Boris Bochkarev <Boris-Bochkaryov[AT]yandex.ru>
Bradford Boyle <bradford.d.boyle[AT]gmail.com>
Branislav Makan <branislav.makan1994[AT]gmail.com>
Britt McKinley <bmckinley[AT]sonusnet.com>
@ -4056,6 +4056,7 @@ Edward Smith <edward.smith[AT]nowlegent.com>
Edwin Groothuis <edwin[AT]mavetju.org>
Emery Hemingway <emery[AT]vfemail.net>
Eric Anderson <andersoe[AT]cs.cmu.edu>
Erik de Jong <erikdejong[AT]gmail.com>
Etienne Millon <etienne[AT]cryptosense.com>
Eugene Adell <eugene.adell[AT]d2-si.eu>
Eugene Exarevsky <eugene.exarevsky[AT]dsr-company.com>
@ -4063,8 +4064,10 @@ Eugene Sukhodolin <eugene[AT]sukhodolin.com>
Fabian Raetz <fabian.raetz[AT]gmail.com>
Fabrizio Demaria <fabrizio.demaria[AT]intel.com>
Florian Lohoff <f[AT]zz.de>
Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly[AT]ujaen.es>
Francois Schneider <francois.schneider[AT]airbus.com>
Francois-Xavier Le Bail <fx.lebail[AT]yahoo.com>
Franklin Mathieu <franklinmathieu[AT]gmail.com>
Ganesh Nawsupe <ganesh991[AT]gmail.com>
Garming Sam <garming[AT]catalyst.net.nz>
Gerard Garcia <ggarcia[AT]deic.uab.cat>
@ -4173,7 +4176,6 @@ Michal Prívozník <mprivozn[AT]redhat.com>
Michał Skalski <mskalski13[AT]gmail.com>
Michele Baldessari <michele[AT]acksyn.org>
Mikael Kanstrup <mikael.kanstrup[AT]gmail.com>
Mikael Kanstrup <mikael.kanstrup[AT]sonymobile.com>
Mike Frysinger <vapier[AT]chromium.org>
Mike Gerschefske <msgersch2[AT]gmail.com>
Mike Morrin <morrinmike[AT]gmail.com>
@ -4257,7 +4259,6 @@ Simon Barber <sbarber[AT]parc.com>
Simon Barber <simon.barber[AT]meraki.net>
Simon Zhong <szhong.jnpr[AT]gmail.com>
Slava Shwartsman <slavash[AT]mellanox.com>
Snaipe <franklinmathieu[AT]gmail.com>
Soumya Koduri <skoduri[AT]redhat.com>
Steev Klimaszewski <threeway[AT]gmail.com>
Stefan Doehla <stefan.doehla[AT]iis.fraunhofer.de>
@ -4318,10 +4319,7 @@ Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp>
Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
anonsvn <anonsvn[AT]localhost>
boris.bochkarev <Boris-Bochkaryov[AT]yandex.ru>
cff339 <cff339[AT]gmail.com>
erikdejong <erikdejong[AT]gmail.com>
franciscojavier.sanchezroselly <franciscojavier.sanchezroselly[AT]ujaen.es>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>