aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-10-24 09:11:06 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-02 16:13:28 +0000
commitd3e0ce42074bb1a662dbe9b79fb4a1191988ac48 (patch)
tree6f4fc383a3edcd904d21ad5e01a9db1587c4f13d /AUTHORS
parent27bd013970476b21ab55ff67eda88cd3228860fe (diff)
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>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS10
1 files changed, 4 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index 2b14927115..56acf2e623 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>