diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-08-05 12:29:25 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-04 03:34:30 +0000 |
| commit | 16e6c12f906fc455e1d2c60a414afd860b7a4e2f (patch) | |
| tree | 741f0a659957764c6d0206ede34f8a83937cb25c | |
| parent | 83a9adbbf2272d7196a7bc0164505b83c1a80681 (diff) | |
.mailmap: update of August (2018)
Change-Id: Ie53f5523721dc71900137f4b416dda9ac0dec688
Reviewed-on: https://code.wireshark.org/review/28972
Reviewed-by: Daniel Mouscher <dmouscher@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | .mailmap | 6 | ||||
| -rw-r--r-- | AUTHORS | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -9,7 +9,8 @@ Anders Broman <anders.broman@ericsson.com> <a.broman58@gmail.com> Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net> Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com> Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com> -Andreas Schultz <andreas.schultz@travelping.com> Andreas Schultz <aschultz@warp10.net> +Andreas Schultz <andreas.schultz@travelping.com> Andreas Schultz <aschultz@warp10.net> +Andrey Tverd <andr.tverd@gmail.com> Andrey <andr.tverd@gmail.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> @@ -32,6 +33,7 @@ Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org> Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de> Christoph Schlosser <christoph@schlosser.xyz> Christoph Schlosser <christoph.schlosser@br-automation.com> Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@gmail.com> +Daniel Mouscher <dmouscher[AT]gmail.com> Mouscher, Daniel [Intern] <dmouscher@gmail.com> Daniel Tan <BACdaBASpert@optigo.net> BACdaBASpert <BACdaBASpert@optigo.net> Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden Daniël van Eeden <wireshark@myname.nl> <git@myname.nl> @@ -64,6 +66,7 @@ Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> fran Franklin Mathieu <franklinmathieu@gmail.com> Franklin "Snaipe" Mathieu <snaipe@diacritic.io> Franklin Mathieu <franklinmathieu@gmail.com> Snaipe <franklinmathieu@gmail.com> Gabriel Ganne <gabriel.ganne@enea.com> Gabriel Ganne <gabriel.ganne@qosmos.com> +Gerald Combs <gerald@wireshark.org> Gerald Combs <gerald.combs@riverbed.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> @@ -182,6 +185,7 @@ Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassa Uli Heilmeier <uh@heilmeier.eu> Uli Heilmeier <openid@heilmeier.eu> Vadim Fedorenko <vadimjunk@gmail.com> Vadim Fedorenko <junk@yandex-team.ru> Vasil Velichkov <vvvelichkov@gmail.com> Vasil Velichckov <vvvelichkov@gmail.com> +Vasil Velichkov <vvvelichkov@gmail.com> Vasil Velichkov <vasko@192.168.1.12> Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com> Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com> Volodymyr Khomenko <Khomenko.Volodymyr@gmail.com> Volodymyr Khomenko <Volodymyr_Khomenko@DellTeam.com> @@ -4003,7 +4003,7 @@ Andreas Urke <arurke[AT]netwurke.com> Andrei Cipu <acipu[AT]ixiacom.com> Andrew Chernyh <andrew.chernyh[AT]gmail.com> Andrew Hoag <Andrew.Hoag[AT]aireon.com> -Andrey <andr.tverd[AT]gmail.com> +Andrey Tverd <andr.tverd[AT]gmail.com> Andy Ling <Andy.Ling[AT]quantel.com> Andy Ling <andy.ling[AT]s-a-m.com> Anil Kumar <anilkumar911[AT]gmail.com> @@ -4081,6 +4081,7 @@ Dan Robertson <danlrobertson89[AT]gmail.com> Dana Sy <dana.hayden.sy[AT]gmail.com> Daniel Mack <daniel[AT]zonque.org> Daniel McLean <maczor[AT]gmail.com> +Daniel Mouscher <dmouscher[AT]gmail.com> Daniel Stenberg <daniel[AT]haxx.se> Daniel Tan <BACdaBASpert[AT]optigo.net> Daniel Willmann <dwillmann[AT]sysmocom.de> @@ -4166,7 +4167,6 @@ Ganesh Nawsupe <ganesh991[AT]gmail.com> Garming Sam <garming[AT]catalyst.net.nz> Gene Cumm <gene.cumm[AT]gmail.com> Georg Brandl <georg[AT]python.org> -Gerald Combs <gerald.combs[AT]riverbed.com> Gerard Garcia <ggarcia[AT]deic.uab.cat> Gergely Nagy <ngg[AT]ngg.hu> Gerhard KHUENY <Gerhard.KHUENY[AT]bachmann.info> @@ -4356,7 +4356,6 @@ Miltos Patsiouras <mipatsio[AT]gmail.com> Mirko Parthey <mirko.parthey[AT]web.de> Moraney Jalil <moraney.jalil[AT]outlook.com> Moshe Kaplan <me[AT]moshekaplan.com> -Mouscher, Daniel [Intern] <dmouscher[AT]gmail.com> Nathan Cole <nath[AT]thecoleresidence.co.uk> Nathaniel Clark <nathaniel.l.clark[AT]intel.com> Neil Ostroff <neil[AT]mangosoup.com> @@ -4529,7 +4528,6 @@ Vadim Fedorenko <vadimjunk[AT]gmail.com> Vadim Yanitskiy <axilirator[AT]gmail.com> ValdikSS <iam[AT]valdikss.org.ru> Valentin Vidic <Valentin.Vidic[AT]CARNet.hr> -Vasil Velichkov <vasko[AT]192.168.1.12> Vasil Velichkov <vvvelichkov[AT]gmail.com> Victor Barratault <victor.barratault[AT]gmail.com> Victor Dodon <dodonvictor[AT]gmail.com> |