summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-17 09:35:38 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-24 06:38:59 +0000
commitfc690a67817eab7ce519e2ac43dde9c8e41d1d43 (patch)
tree7451b1c152b52e053aac48a447a241a5e4a4ff9e /AUTHORS
parent172b74d734127e88bb305d4dc691da7a81ca5deb (diff)
downloadwireshark-fc690a67817eab7ce519e2ac43dde9c8e41d1d43.tar.gz
Update .mailmap
Change-Id: Ie6b9c0fabc31187a81bc3b41001fd558f69e062f Reviewed-on: https://code.wireshark.org/review/14500 Reviewed-by: Daniël van Eeden <wireshark@myname.nl> Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS5
1 files changed, 1 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index e5b6f90d43..9eec00abd9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3933,7 +3933,6 @@ Adam Goldman <adam.goldman[AT]intel.com>
Adam Pridgen <adam.pridgen[AT]thecoverofnight.com>
Adam Schwalm <adam.schwalm[AT]dynetics.com>
Aditya Jain <aditya.jain[AT]samsung.com>
-Adrian <daniel.simionov[AT]gmail.com>
Adrian Simionov <daniel.simionov[AT]gmail.com>
Adrian-Ken Rueegsegger <ken[AT]codelabs.ch>
Alan Partis <alpartis[AT]thundernet.com>
@@ -3995,7 +3994,6 @@ 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>
-Daniël van Eeden <git[AT]myname.nl>
Daniël van Eeden <wireshark[AT]myname.nl>
Darshan Nevgi <darshan.sn[AT]samsung.com>
Dave Rigby <daver[AT]couchbase.com>
@@ -4094,7 +4092,7 @@ MarkPhillips <mark.s.phillips[AT]outlook.com>
Marko Hrastovec <marko.hrastovec[AT]gmail.com>
Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com>
Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
-Matthieu Coudron <mattator[AT]gmail.com>
+Matthieu Coudron <matthieu.coudron[AT]lip6.fr>
Micha Reiser <michafamreiser.ch>
Michael Adam <obnox[AT]samba.org>
Michael McConville <mmcco[AT]mykolab.com>
@@ -4155,7 +4153,6 @@ Richard Kuemmel <kuemmel.ric[AT]googlemail.com>
Richard Sharpe <rsharpe[AT]samba.org>
Rishi Dev Singh <rishi.dev[AT]samsung.com>
Robert Beardsworth <rob_beardsworth[AT]hotmail.com>
-Robert Cragie <robert.cragie[AT]arm.com>
Robert Cragie <robert.cragie[AT]gmail.com>
Robert P <tehownt[AT]gmail.com>
Roland Knall <rknall[AT]gmail.com>