diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-07-16 10:50:19 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-07-16 12:41:48 +0000 |
| commit | feb510df69f56eb1c5662375518bd5138d6cd1c8 (patch) | |
| tree | f00e71555e0ca770149f3bdf58d8e30666bf5573 /.mailmap | |
| parent | bdff83463186e28466f6ffb16a09583c1469a8e8 (diff) | |
.mailmap: fix duplicates and regenerate AUTHORS
Change-Id: I1332c63d59edf5b2a2ac8fe605d6f15cf6afa4ae
Reviewed-on: https://code.wireshark.org/review/22638
Reviewed-by: Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp>
Reviewed-by: Jonathan M Munoz S <jonathan.munoz@inria.fr>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -71,6 +71,7 @@ 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> John Miner <optommp@gmail.com> John <optommp@gmail.com> +Jonathan Muñoz <jonathan.munoz@inria.fr> Jorge Power <jpower@rsscorp.org> jorge power Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de> @@ -156,4 +157,5 @@ 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> +Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> <yatch@isl.rdc.toshiba.co.jp> Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com> |