Skip to content

Commit

Permalink
.mailmap: Update (of november)
Browse files Browse the repository at this point in the history
Change-Id: I643825baa09bf1b6b54515dc109669c0cb1e2cd7
Reviewed-on: https://code.wireshark.org/review/18800
Reviewed-by: Franklin Mathieu <[email protected]>
Reviewed-by: Michael Mann <[email protected]>
  • Loading branch information
alagoutte authored and mmann78 committed Dec 9, 2016
1 parent 6b064e0 commit 58f6018
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@ Daniël van Eeden <[email protected]> <[email protected]>
Dave Tapuska <[email protected]> [email protected]
David Ameiss <[email protected]> <[email protected]>
David Zoller <[email protected]> dz-msfc <[email protected]>
Deep Datta <[email protected]> Deep Datta <[email protected]>
Denis Janssen <[email protected]> janssend <[email protected]>
Didier Gautheron <[email protected]> didier <[email protected]>
Dmitry Bazhenov <[email protected]> U-beauty\bdn <[email protected]>
Dmitry Lazurkin <[email protected]> Dmitry Lazurkin <[email protected]>
Edwin Groothuis <[email protected]> <[email protected]>
Erik de Jong <[email protected]> erikdejong <[email protected]>
Eugene Exarevsky <[email protected]> dsrsupport <[email protected]>
Evan Huus <[email protected]> <[email protected]>
Francesco Fondelli <[email protected]> ff <[email protected]>
Francisco Javier Sánchez-Roselly <[email protected]> franciscojavier.sanchezroselly <[email protected]>
Franklin Mathieu <[email protected]> Franklin "Snaipe" Mathieu <[email protected]>
Franklin Mathieu <[email protected]> Snaipe <[email protected]>
Gerald Combs <[email protected]> <[email protected]>
Gilbert Ramirez <[email protected]> <[email protected]>
Expand Down Expand Up @@ -107,6 +110,7 @@ Ronnie Sahlberg <[email protected]> <[email protected]>
Rudra Rugge <[email protected]> Rudra Rugge <[email protected]>
Russel Howe <[email protected]> Russel <[email protected]>
Rustam Safargalin <[email protected]> Rustam S <[email protected]>
Sanket Godbole <[email protected]> sangodbole <[email protected]>
Selva Kumar <[email protected]> Selva <[email protected]>
Shekhar Chandra <[email protected]> ranushekhar
Shuai Xiao <[email protected]> shuai xiao <[email protected]>
Expand Down
5 changes: 1 addition & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -4054,7 +4054,6 @@ David Tapuska <dave[AT]tapuska.com>
David Zoller <zollerd[AT]gmail.com>
Davide Caratti <davide.caratti[AT]gmail.com>
Deep Datta <ddatta[AT]ixiacom.com>
Deep Datta <deepdatta2010[AT]yahoo.co.in>
Denis Janssen <janssend[AT]gmail.com>
Devin Heitmueller <dheitmueller[AT]kernellabs.com>
Dhananjay Patki <dhpatki[AT]cisco.com>
Expand All @@ -4063,7 +4062,6 @@ DiablosOffens <DiablosOffens[AT]gmx.de>
Didier Arenzana <darenzana[AT]yahoo.fr>
Diederik de Groot <ddegroot[AT]talon.nl>
Dmitry Lazurkin <dilaz03[AT]gmail.com>
Dmitry Lazurkin <dmitry.lazurkin[AT]synesis.ru>
Dom Gifford <Dominic.Gifford[AT]atmel.com>
Dominic Chen <d.c.ddcc[AT]gmail.com>
Doug Brown <doug[AT]downtowndougbrown.com>
Expand All @@ -4085,7 +4083,6 @@ 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 "Snaipe" Mathieu <snaipe[AT]diacritic.io>
Franklin Mathieu <franklinmathieu[AT]gmail.com>
Ganesh Nawsupe <ganesh991[AT]gmail.com>
Garming Sam <garming[AT]catalyst.net.nz>
Expand Down Expand Up @@ -4266,6 +4263,7 @@ Ryan Mullen <rmmullen[AT]gmail.com>
Rémy Léone <remy.leone[AT]gmail.com>
Samiran Saha <ssahasamiran[AT]gmail.com>
Sander Steffann <sander[AT]steffann.nl>
Sanket Godbole <sanket.godbole[AT]spirent.com>
Sebastian Kloeppel <sk[AT]nakedape.net>
Sebastian Schildt <sebastian[AT]frozenlight.de>
Selva Kumar <v.selvamuthukumar[AT]gmail.com>
Expand Down Expand Up @@ -4347,7 +4345,6 @@ anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
sangodbole <sanket.godbole[AT]spirent.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>

Expand Down

0 comments on commit 58f6018

Please sign in to comment.