aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-06-05 21:11:51 +0200
committerAnders Broman <a.broman58@gmail.com>2016-06-06 06:23:56 +0000
commitd40b40d0549679f95ca968555e9250122a109fe6 (patch)
tree824fd905e5b261be45e1be025783326340f8975f /.mailmap
parent57ef06e242dbbce390547d9711f810fc60829219 (diff)
Update .mailmap: fix duplicate entry or name typo
Change-Id: I72ad4ba629af55b54c10d5623018aef65a9eac0e Reviewed-on: https://code.wireshark.org/review/15744 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 87e13bc6e1..5705dd3912 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,6 +53,7 @@ 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>
Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com>
+Juan Pablo Mendoza <jpablo@gmail.com> jpmendoza <jpablo@gmail.com>
Kary Rogers <kary.rogers@gmail.com> karyrogers <kary.rogers@gmail.com>
Krishna Chaitanya <chaitanya.mgit@gmail.com> tkc <chaitanya.mgit@gmail.com>
Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at>
@@ -99,8 +100,11 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>
Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com>
Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
+Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
+Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.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>
+Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>