diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-06-05 21:11:51 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-06 06:23:56 +0000 |
commit | d40b40d0549679f95ca968555e9250122a109fe6 (patch) | |
tree | 824fd905e5b261be45e1be025783326340f8975f | |
parent | 57ef06e242dbbce390547d9711f810fc60829219 (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>
-rw-r--r-- | .mailmap | 4 | ||||
-rw-r--r-- | AUTHORS | 8 | ||||
-rw-r--r-- | AUTHORS.src | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -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> @@ -3922,7 +3922,7 @@ Robert Long <rlong[AT]sandia.gov> James Lynch <lynch007[AT]gmail.com> Chidambaram Arunachalam <carunach[AT]cisco.com> João Valverde <joao.valverde[AT]tecnico.ulisboa.pt> -Benoît Canet <benoit@scylladb.com> +Benoît Canet <benoit[AT]scylladb.com> @@ -3967,7 +3967,6 @@ Benjamin Coddington <bcodding[AT]redhat.com> Benjamin Hesmans <benjamin.hesmans[AT]uclouvain.be> Benjamin Roch <benjamin.roch[AT]tttech.com> Benoit Grange <benoit.grange[AT]gmail.com> -Benoît Canet <benoit[AT]scylladb.com> Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com> Binh Trinh <beango[AT]gmail.com> Birol Capa <birol.capa[AT]siemens.com> @@ -4075,6 +4074,7 @@ Joseph Huffman <jhuffman[AT]codeaurora.org> Josip Medved <jmedved[AT]jmedved.com> Juan Jose Martin Carrascosa <juanjo[AT]rti.com> Juan Matias <jmrepetti[AT]gmail.com> +Juan Pablo Mendoza <jpablo[AT]gmail.com> Julien STAUB <atsju2[AT]yahoo.fr> Jun Wang <sdn_app[AT]163.com> JustinKu <jiunrong[AT]gmail.com> @@ -4221,11 +4221,9 @@ Victor Dodon <dodonvictor[AT]gmail.com> Victor Voronkov <victor.voronkov[AT]gmail.com> Vik <vkp129+ubuntu[AT]gmail.com> Vikhyat Umrao <vumrao[AT]redhat.com> -Vikram Hegde <vikram.h[AT]amsung.com> Vikram Hegde <vikram.h[AT]samsung.com> Ville Skyttä <ville.skytta[AT]iki.fi> Vincent Helfre <vincent.helfre[AT]gmx.net> -Vincent Helfre <vincenthelfre[AT]googlemail.com> Vincenzo Reale <smart2128[AT]baslug.org> Vladimir Kondratiev <qca_vkondrat[AT]qca.qualcomm.com> Volker Lendecke <vl[AT]samba.org> @@ -4236,7 +4234,6 @@ Weston Schmidt <weston_schmidt[AT]alumni.purdue.edu> Xavier Brouckaert <xabrouck[AT]cisco.com> YFdyh000 <yfdyh000[AT]gmail.com> Yan Burman <yanb[AT]mellanox.com> -Yang Luo <hsluoyz[AT]gmail.com> Yang Luo <hsluoyz[AT]qq.com> Yann Lejeune <ylejeune[AT]netyl.org> Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp> @@ -4245,7 +4242,6 @@ anilkumar911 <anilkumar911[AT]gmail.com> anonsvn <anonsvn[AT]localhost> cff339 <cff339[AT]gmail.com> dsrsupport <eugene.exarevsky[AT]dsr-company.com> -jpmendoza <jpablo[AT]gmail.com> kardam <netkardam[AT]gmail.com> kkoizumi <kkoizumi46[AT]gmail.com> Øyvind Rønningstad <ronningstad[AT]gmail.com> diff --git a/AUTHORS.src b/AUTHORS.src index f4da36154e..e37f1833c8 100644 --- a/AUTHORS.src +++ b/AUTHORS.src @@ -3922,7 +3922,7 @@ Robert Long <rlong[AT]sandia.gov> James Lynch <lynch007[AT]gmail.com> Chidambaram Arunachalam <carunach[AT]cisco.com> João Valverde <joao.valverde[AT]tecnico.ulisboa.pt> -Benoît Canet <benoit@scylladb.com> +Benoît Canet <benoit[AT]scylladb.com> Acknowledgements |