diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-07-26 12:07:24 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-26 11:34:29 +0000 |
| commit | 84f4a223d4b833204ea535edcc9297fe51aa84ba (patch) | |
| tree | 01e6c4cbe74f2a58453d503611a2183bd4ff36f0 | |
| parent | 7b75871bd9faacb948475eae4afbc7e4bd4a4c9a (diff) | |
Update .mailmap
Change-Id: Id725f28977282b289a2de26cac2fb92713babe6a
Reviewed-on: https://code.wireshark.org/review/16692
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | AUTHORS | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -9,6 +9,7 @@ Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson. Andy Ling <andy.ling@s-a-m.com> AndyL <andy.ling@s-a-m.com> Anil Kumar K K <anilkumar911@gmail.com> anilkumar911 <anilkumar911@gmail.com> Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com> +Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org> Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com> Cal Turney <cturney@charter.net> cturney <cturney@charter.net> Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com> @@ -106,6 +107,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook. Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com> Sumit Kumar Jha <sjha3@ncsu.edu> sjha3 <sjha3@ncsu.edu> Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com> +Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassau@hotmail.fr> 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> @@ -3972,6 +3972,7 @@ Arnd Hannemann <arnd[AT]arndnet.de> Artur Nowosielski <artnowo[AT]gmail.com> Ashish Shukla <shukla.a[AT]gmail.com> Aurelien Aptel <aaptel[AT]suse.com> +Bartolo Otrit <bartolootrit[AT]gmail.com> Basil <addremover[AT]gmail.com> Bastien Bailly <babassbailly[AT]free.fr> Ben Burwell <bburwell[AT]lutron.com> @@ -4049,6 +4050,7 @@ Florian Lohoff <f[AT]zz.de> Francois Schneider <francois.schneider[AT]airbus.com> Ganesh Nawsupe <ganesh991[AT]gmail.com> Garming Sam <garming[AT]catalyst.net.nz> +Gerard Garcia <ggarcia[AT]deic.uab.cat> Gergely Nagy <ngg[AT]ngg.hu> Gerhard KHUENY <Gerhard.KHUENY[AT]bachmann.info> Gloria Pozuelo <gloria.pozuelo[AT]bics.com> @@ -4233,7 +4235,7 @@ T. Scholz <scholzt234[AT]googlemail.com> Tatsuhiro Tsujikawa <tatsuhiro.t[AT]gmail.com> Thibault Gerondal <github[AT]tycale.be> Thies Moeller <thies.moeller[AT]baslerweb.com> -Thomas PORTASSAU <thomas.portassau[AT]hotmail.fr> +Thomas Portassau <thomas.portassau[AT]hotmail.fr> Thomas Shen <thomashen[AT]gmail.com> Tigran Mkrtchyan <tigran.mkrtchyan[AT]desy.de> Tim (Thanh) Nguyen <tnnguyen[AT]broadcom.com> |