diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-02-20 14:14:43 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-03-30 17:16:44 +0000 |
commit | 1c3d85d577d3820486df2c9ebee687301f5c812b (patch) | |
tree | 391983b1b0550aa5b93f5c87cccb4b900c601614 /.mailmap | |
parent | 038679c6531b763a8c11e157f962d44f61f08b21 (diff) |
.mailmap: Update (of February and March)
Change-Id: Ib728c6ebf0a029e7241a042a0ca80c602df8e89e
Reviewed-on: https://code.wireshark.org/review/20202
Reviewed-by: Mark Phillips <mark.phil@samsung.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 8 |
1 files changed, 7 insertions, 1 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> |