diff options
| -rw-r--r-- | .mailmap | 8 | ||||
| -rw-r--r-- | AUTHORS | 8 |
2 files changed, 9 insertions, 7 deletions
@@ -40,6 +40,7 @@ Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.c Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> franciscojavier.sanchezroselly <franciscojavier.sanchezroselly@ujaen.es> 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@zing.org> Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com> Gloria Pozuelo <gloria.pozuelo@bics.com> glores <gloria.pozuelo@bics.com> @@ -75,6 +76,8 @@ Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation 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 +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> Martin Kaiser <wireshark@kaiser.cx> <martin@reykholt.kaiser.cx> Martin Kaiser <wireshark@kaiser.cx> <martin@skogar.kaiser.cx> @@ -110,6 +113,7 @@ Richard Kuemmel <kuemmel.ric@googlemail.com> richardk <kuemmel.ric@googlemail.co Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com> Robert Cragie <robert.cragie@gmail.com> Robert Cragie <robert.cragie@arm.com> Robert Grange <robionekenobi@bluewin.ch> robioneknobi +Ronen Boazi <ronen.boazi@intel.com> Boazi <ronen.boazi@intel.com> Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au> Rudra Rugge <rrugge@juniper.net> Rudra Rugge <rudrarugge@gmail.com> Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com> @@ -119,7 +123,9 @@ Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com> Shekhar Chandra <ranushekhar@gmail.com> ranushekhar Shuai Xiao <iamhihi@gmail.com> shuai xiao <iamhihi@gmail.com> Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org> -Stephen Donnelly <stephen.donnelly@emulex.com> sfd +Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@emulex.com> +Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@endace.com> +Stephen Donnelly <stephen@endace.com> Stephen Donnelly <stephen.donnelly@emulex.com> Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com> Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org> Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com> @@ -4014,7 +4014,6 @@ 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> -Boazi <ronen.boazi[AT]intel.com> Boris Bochkarev <Boris-Bochkaryov[AT]yandex.ru> Bradford Boyle <bradford.d.boyle[AT]gmail.com> Branislav Makan <branislav.makan1994[AT]gmail.com> @@ -4102,7 +4101,6 @@ Francois-Xavier Le Bail <fx.lebail[AT]yahoo.com> Frank Carpenter <frank.carpenter[AT]spectralink.com> Franklin Mathieu <franklinmathieu[AT]gmail.com> Gabriel Ganne <gabriel.ganne[AT]enea.com> -Gabriel Ganne <gabriel.ganne[AT]qosmos.com> Ganesh Nawsupe <ganesh991[AT]gmail.com> Garming Sam <garming[AT]catalyst.net.nz> Gene Cumm <gene.cumm[AT]gmail.com> @@ -4201,9 +4199,8 @@ Marcin Rokicki <marcin.rokicki[AT]gmail.com> Marian Ďurkovič <md[AT]bts.sk> Marius <mareko.paliga[AT]gmail.com> Mark Cunningham <launchpad[AT]markcunningham.ie> -Mark Phillips <mark.phil[AT]samsung.com> +Mark Phillips <mark.s.phillips[AT]outlook.com> Mark Weel <markweel[AT]hotmail.com> -MarkPhillips <mark.s.phillips[AT]outlook.com> Marko Hrastovec <marko.hrastovec[AT]gmail.com> Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com> Martin Vit <martin[AT]voipmonitor.org> @@ -4292,6 +4289,7 @@ Robert P <tehownt[AT]gmail.com> Roland Knall <rknall[AT]gmail.com> Roman Leonhartsberger <ro.leonhartsberger[AT]gmail.com> Roman Volkov <volkoff_roman[AT]ukr.net> +Ronen Boazi <ronen.boazi[AT]intel.com> Rudra Rugge <rrugge[AT]juniper.net> Russel Howe <russel[AT]appliedinvention.com> Rustam Safargalin <rustam.safargalin[AT]sifox.ru> @@ -4326,7 +4324,6 @@ 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> Sunil Mushran <sunil.mushran[AT]oracle.com> Sven Eckelmann <sven[AT]open-mesh.com> Sven Schnelle <svens[AT]stackframe.org> @@ -4383,7 +4380,6 @@ anonsvn <anonsvn[AT]localhost> cff339 <cff339[AT]gmail.com> kardam <netkardam[AT]gmail.com> kkoizumi <kkoizumi46[AT]gmail.com> -sfd <stephen.donnelly[AT]endace.com> Éric Piel <piel[AT]delmic.com> Øyvind Rønningstad <ronningstad[AT]gmail.com> Дмитрий Цветцих <dmitrycvet[AT]gmail.com> |