summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-05-15 19:30:30 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2017-06-06 13:33:11 +0000
commite11a11b83b95d0467ff160d1e34d5e562ec1da55 (patch)
tree68da4b106628a25526af95a51f5f25f74b8486e2 /AUTHORS
parenta55756d73c74e18e923ac06463ddfb3e37dcaa96 (diff)
downloadwireshark-e11a11b83b95d0467ff160d1e34d5e562ec1da55.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> (cherry picked from commit 6216e576fc063661a36eea3f9596bc0d1ca034e2) Reviewed-on: https://code.wireshark.org/review/21980
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 0 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index c7701a38aa..0566f93956 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>