aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-09-16 19:07:14 +0000
committerAnders Broman <a.broman58@gmail.com>2018-10-03 03:53:46 +0000
commitf9be57ed361a4651112daf0f87f599c74b486bf9 (patch)
tree7cc3b379800ab2cc9a97348fac60f759a2a72294 /.mailmap
parent29fbbfb3d39e801280d21e608bc269af4c1cd0cd (diff)
.mailmap: update of September (2018)
Change-Id: Id7a13ba71feb78c87ac87f0acd7a63de15aaf7e3 Reviewed-on: https://code.wireshark.org/review/29684 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 b7d8b1b2a8..e732b87db7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,12 +18,14 @@ Antony Bridle <ant.bridle@gmail.com> antony.bridle <ant.bridle@gmail.com>
Balint Reczey <balint@balintreczey.hu> Balint Reczey <balint.reczey@canonical.com>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org>
+Başak Kalfa <basakkalfa@gmail.com> basakkal <basakkalfa@gmail.com>
Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru>
Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> Cal Turney <cturney111@gmail.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
Cedric Izoard <cedric.izoard@ceva-dsp.com> Cedric Izoard <cedric.izoard@rivierawaves.com>
+Chaoyong Zhou <bgnvendor@163.com> chaoyongzhou <bgnvendor@163.com>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
Chris Bontje <cbontje@gmail.com> chrisbontje <cbontje@gmail.com>
Chris Brandson <chris.brandson@gmail.com> Chris Brandson <cjb@exegin.com>
@@ -92,6 +94,7 @@ Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com>
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>
+Joeri de Ruiter <joeri@cypherpunk.nl> Joeri <joeri@cypherpunk.nl>
John Miner <optommp@gmail.com> John <optommp@gmail.com>
Jonathan Muñoz <jonathan.munoz@inria.fr> Jonathan Munoz <jonathan.munoz@inria.fr>
Jorge Power <jpower@rsscorp.org> jorge power
@@ -141,6 +144,7 @@ Oliver Downard <oliver.downard@couchbase.com> olivermd <oliver.downard@couchbase
Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com>
Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
+Patrik Moško <patrikmosko95@gmail.com> PatrikMosko <patrikmosko95@gmail.com>
Paul Williamson <paul@mustbeart.com> MustBeArt<paul@mustbeart.com>
Pavel Strnad <strnadp@tiscali.cz> Pavel Strnad <pavel_strnad@hotmail.com>
Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>