diff options
| -rw-r--r-- | .mailmap | 6 | ||||
| -rw-r--r-- | AUTHORS | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -18,9 +18,10 @@ Chris Maynard <Christopher.Maynard@GTECH.COM> <Christopher.Maynard@igt.com> Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org> Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de> Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@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> -Dave Tapuska <dtapuska@google.com> dave@tapuska.com> +Dave Tapuska <dtapuska@google.com> dave@tapuska.com David Ameiss <dameiss@29west.com> <netshark@ameissnet.com> David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com> Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com> @@ -72,6 +73,7 @@ Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens <martin.tibensky@alcatel-lucent.com> Martin Tibenský <martin.tibensky@alcatel-lucent.com> <tibensky233@gmail.com> Matthieu Coudron <matthieu.coudron@lip6.fr> <mattator@gmail.com> +Matthieu Texier <matthieu@texier.tv> Matt Texier <matthieu@texier.tv> Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com> Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de> Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local> @@ -81,6 +83,7 @@ Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.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> +Olga Kornievskaia <kolga@netapp.com> Olga Kornievskaia <olga.kornievskaia@gmail.com> Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com> Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost> Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com> @@ -100,6 +103,7 @@ Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com> Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru> Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com> Shekhar Chandra <ranushekhar@gmail.com> ranushekhar +Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org> Stephen Donnelly <stephen.donnelly@emulex.com> sfd Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com> Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org> @@ -3976,7 +3976,6 @@ Arnd Hannemann <arnd[AT]arndnet.de> Artur Nowosielski <artnowo[AT]gmail.com> Ashish Shukla <shukla.a[AT]gmail.com> Aurelien Aptel <aaptel[AT]suse.com> -BACdaBASpert <BACdaBASpert[AT]optigo.net> Bartolo Otrit <bartolootrit[AT]gmail.com> Basil <addremover[AT]gmail.com> Bastien Bailly <babassbailly[AT]free.fr> @@ -4020,6 +4019,7 @@ Cédric Delmas <cedricde[AT]outlook.fr> D. Ulis <daulis0[AT]gmail.com> Daniel Mack <daniel[AT]zonque.org> Daniel Stenberg <daniel[AT]haxx.se> +Daniel Tan <BACdaBASpert[AT]optigo.net> Daniel Willmann <dwillmann[AT]sysmocom.de> Daniele Lacamera <daniele.lacamera[AT]technicolor.com> Daniël van Eeden <wireshark[AT]myname.nl> @@ -4183,7 +4183,6 @@ Nils Ohlmeier <github[AT]ohlmeier.org> Noel Power <noel.power[AT]suse.com> Olaf Bergmann <bergmann[AT]tzi.org> Olga Kornievskaia <kolga[AT]netapp.com> -Olga Kornievskaia <olga.kornievskaia[AT]gmail.com> Oren Koler <clicker78[AT]gmail.com> Orgad Shaneh <orgads[AT]gmail.com> Oscar Gonzalez de Dios <oscar.gonzalezdedios[AT]telefonica.com> @@ -4253,6 +4252,7 @@ Steev Klimaszewski <threeway[AT]gmail.com> Stefan Doehla <stefan.doehla[AT]iis.fraunhofer.de> Stefan Pöschel <github[AT]basicmaster.de> Stefan Völkel <sv[AT]its-v.de> +Stella Randall <stella.randall[AT]emeerson.com> Stephan Kappertz <octopus.sk[AT]googlemail.com> Stephane Bryant <stephane.ml.bryant[AT]gmail.com> Stephen Donnelly <stephen.donnelly[AT]emulex.com> @@ -4309,7 +4309,6 @@ anonsvn <anonsvn[AT]localhost> cff339 <cff339[AT]gmail.com> kardam <netkardam[AT]gmail.com> kkoizumi <kkoizumi46[AT]gmail.com> -rosemountSkp <rosemountSkp[AT]code.wireshark.org> Øyvind Rønningstad <ronningstad[AT]gmail.com> Дмитрий Цветцих <dmitrycvet[AT]gmail.com> |