diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-06-08 09:53:56 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-07-04 18:02:13 +0000 |
| commit | 3bd9f8c6aab3ef7278ebe29250753f380a86bc26 (patch) | |
| tree | f2d68fe130b9c1b6e0b9ce48fc68b6cbbfc3a5f1 | |
| parent | bb470c9067a1f44b2665d26d1af38efa722e30a1 (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>
| -rw-r--r-- | .mailmap | 5 | ||||
| -rw-r--r-- | AUTHORS | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -66,6 +66,7 @@ Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com> +Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com> Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com> Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com> João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt> @@ -117,6 +118,8 @@ Pratik Yeole <pyeole@ncsu.edu> Pyeole <pyeole@ncsu.edu> Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com> Remi Vichery <remi.vichery@gmail.com> Richard Kuemmel <kuemmel.ric@googlemail.com> richardk <kuemmel.ric@googlemail.com> +Richard Sharpe <realrichardsharpe@gmail.com> Richard Sharpe <richard.sharpe@primarydata.com> +Richard Sharpe <realrichardsharpe@gmail.com> Richard Sharpe <rsharpe@samba.org> Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com> Robert Cragie <robert.cragie@gmail.com> Robert Cragie <robert.cragie@arm.com> Robert Grange <robionekenobi@bluewin.ch> robioneknobi @@ -130,6 +133,7 @@ Sanket Godbole <sanket.godbole@spirent.com> sangodbole <sanket.godbole@spirent.c 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> +Simon Barber <simon.barber@meraki.net> Simon Barber <sbarber@parc.com> Simon Zhong <szhong.jnpr@gmail.com> szhong <szhong.jnpr@gmail.com> Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org> Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@emulex.com> @@ -152,3 +156,4 @@ Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com> Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com> Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com> Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com> +Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com> @@ -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> |