aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-06-08 09:53:56 +0000
committerMichael Mann <mmann78@netscape.net>2017-07-04 18:02:13 +0000
commit3bd9f8c6aab3ef7278ebe29250753f380a86bc26 (patch)
treef2d68fe130b9c1b6e0b9ce48fc68b6cbbfc3a5f1 /AUTHORS
parentbb470c9067a1f44b2665d26d1af38efa722e30a1 (diff)
.mailmap: update (of June)
Change-Id: Ibd558c7030cb39e7978a05b5ba633303ed0ea046 Reviewed-on: https://code.wireshark.org/review/22033 Reviewed-by: Jeroen Sack <jsack@lely.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS8
1 files changed, 2 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index ddbf0598db..e7bccce48b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4163,8 +4163,7 @@ Jeffrey Smith <whydoubt[AT]gmail.com>
Jens Kilian <jens.kilian[AT]advantest.com>
Jeremy Hitt <jeremy.hitt[AT]isilon.com>
Jeroen Roovers <jer[AT]gentoo.org>
-Jeroen Sack <jeroen[AT]jeroensack.nl>
-Jeroen Sack <jsack[AT]lely.com>
+Jeroen Sack <jeroen@jeroensack.nl>
Jesse Gross <jesse[AT]kernel.org>
Jim Schaettle <jimschaettle[AT]gmail.com>
Jim Young <jyoung[AT]gsu.edu>
@@ -4316,8 +4315,6 @@ Remi Gacogne <remi.gacogne[AT]powerdns.com>
Ricardo Cristian Ramirez <r.cristian.ramirez[AT]gmail.com>
Rich Coe <richcoe2[AT]gmail.com>
Richard Kuemmel <kuemmel.ric[AT]googlemail.com>
-Richard Sharpe <richard.sharpe[AT]primarydata.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]gmail.com>
@@ -4351,7 +4348,6 @@ Shoichi Sakane <wireshark-shoichi[AT]tanu.org>
Shu Shen <shu.shen[AT]gmail.com>
Shuai Xiao <iamhihi[AT]gmail.com>
Silvio Gissi <silvio.gissi[AT]gmail.com>
-Simon Barber <sbarber[AT]parc.com>
Simon Barber <simon.barber[AT]meraki.net>
Simon Zhong <szhong.jnpr[AT]gmail.com>
Slava Shwartsman <slavash[AT]mellanox.com>
@@ -4418,11 +4414,11 @@ Yann Lejeune <ylejeune[AT]netyl.org>
Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp>
Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
+Zhao Lin <zlbinghamton[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
-linzhao115 <zlbinghamton[AT]gmail.com>
Éric Piel <piel[AT]delmic.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>