aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-04-25 09:47:41 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-04-26 07:59:34 +0000
commitf26262abe66bf0064b99f0f330d10541df228a78 (patch)
treefa5076134f2a050947af1e44cf27cd5029da6fcd /.mailmap
parent442c9bf33a94a11527ed44cbfa429f7b3e5de841 (diff)
Update .mailmap (and regenerate AUTHORS)
Change-Id: Iae5c032e3d21a694845b89b285d61d45c6f8584f Reviewed-on: https://code.wireshark.org/review/15105 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 54dde70d52..87e13bc6e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,4 +102,5 @@ Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>
+Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>