summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-13 18:47:28 +0100
committerMichael Mann <mmann78@netscape.net>2016-12-09 00:25:50 +0000
commit58f601879a523ecd0ea629bca0da5fb36e1ef416 (patch)
treea43d194cd43739cbfe398f6a12c508e33bb53136
parent6b064e0e145053dbaf96fb0e7b90a46979ce2c8c (diff)
downloadwireshark-58f601879a523ecd0ea629bca0da5fb36e1ef416.tar.gz
.mailmap: Update (of november)
Change-Id: I643825baa09bf1b6b54515dc109669c0cb1e2cd7 Reviewed-on: https://code.wireshark.org/review/18800 Reviewed-by: Franklin Mathieu <snaipe@diacritic.io> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--.mailmap4
-rw-r--r--AUTHORS5
2 files changed, 5 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index d814309d72..ef49ee26c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,15 +26,18 @@ Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
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>
+Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in>
Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
+Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
Eugene Exarevsky <eugene.exarevsky@dsr-company.com> dsrsupport <eugene.exarevsky@dsr-company.com>
Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com>
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>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
@@ -107,6 +110,7 @@ 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>
Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
+Sanket Godbole <sanket.godbole@spirent.com> sangodbole <sanket.godbole@spirent.com>
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>
diff --git a/AUTHORS b/AUTHORS
index a6d06fbdbf..f9c95a594d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>