summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-05-15 19:30:30 +0000
committerMichael Mann <mmann78@netscape.net>2017-06-03 12:34:35 +0000
commit6216e576fc063661a36eea3f9596bc0d1ca034e2 (patch)
tree1d8ffdbd22ef639a3c022faaa4b58cdd547243ff /AUTHORS
parentc508932a60dcc44904bf91474ac3aab049026ebe (diff)
downloadwireshark-6216e576fc063661a36eea3f9596bc0d1ca034e2.tar.gz
.mailmap: update (of May)
Change-Id: I40cf8db41036a6ba1d6a67fb0a4f3e194ad1107b Reviewed-on: https://code.wireshark.org/review/21671 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS3
1 files changed, 1 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index f459520ec4..69aaefa223 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4044,7 +4044,6 @@ Christian Tellefsen <chris-git[AT]tellefsen.net>
Christian Ullrich <chris[AT]chrullrich.net>
Christoph Burger-Scheidlin <mail[AT]christoph.burger-scheidlin.name>
Christoph Jähnigen <nuabaranda[AT]web.de>
-Christoph Schlosser <christoph.schlosser[AT]br-automation.com>
Christoph Schlosser <christoph[AT]schlosser.xyz>
Christopher Kilgour <techie[AT]whiterocker.com>
Chuan He <bupthc[AT]gmail.com>
@@ -4061,7 +4060,7 @@ Daniel Tan <BACdaBASpert[AT]optigo.net>
Daniel Willmann <dwillmann[AT]sysmocom.de>
Daniele Lacamera <daniele.lacamera[AT]technicolor.com>
Daniël van Eeden <wireshark[AT]myname.nl>
-DarienSpencer65 <cusneud[AT]mail.com>
+Darien Spencer <cusneud[AT]mail.com>
Darshan Nevgi <darshan.sn[AT]samsung.com>
Dave Pifke <dave[AT]pifke.org>
Dave Rigby <daver[AT]couchbase.com>