From 06ab7f5a4e0643c2baade6ed4c3babc2fd3e2ce0 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 4 Jul 2017 13:42:03 +0000 Subject: [PATCH] .mailmap: update (of July and Mid-August) Change-Id: I53c3dab6f83cce138a06bb95f1f3bacec681a2a2 Reviewed-on: https://code.wireshark.org/review/23021 Reviewed-by: cedric izoard Reviewed-by: Balint Reczey Reviewed-by: Anders Broman --- .mailmap | 9 ++++++++- AUTHORS | 6 ++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index e262de66f6..8abc53432f 100644 --- a/.mailmap +++ b/.mailmap @@ -9,14 +9,17 @@ Anders Broman AndersBroman AndyL Anil Kumar K K anilkumar911 Anish Anish Bhatt +Balint Reczey Balint Reczey Balint Reczey Bartolo Otrit bartolootrit Boris Bochkarev boris.bochkarev Brian Whitney bwhitn Cal Turney Cal Turney Cal Turney cturney +Cedric Izoard Cedric Izoard Chris Bontje cbontje Chris Bontje chrisbontje +Chris Brandson Chris Brandson Chris Dunlop cjdunlop Chris Maynard Christian M. Amsüss chrysn @@ -71,7 +74,7 @@ Jim Schaettle Nick Jiří Engelthaler Jiri Engelthaler João Valverde João Valverde John Miner John -Jonathan Muñoz +Jonathan Muñoz Jonathan Munoz Jorge Power jorge power Jörg Mayer Joerg Mayer Jörg Mayer Jörg Mayer @@ -80,11 +83,14 @@ Jose Rubio clairvoyant Juan Jose Martin Carrascosa Juanjo Juan Pablo Mendoza jpmendoza Kary Rogers karyrogers +Kasper Deng KasperDeng Krishna Chaitanya tkc Lukas Emersberger Lukas Emersberger Marcel Essig Marian Ďurkovič Marian Durkovic +Marius Paliga Marius +Marius Paliga Marius Paliga Mark Phillips Mark Phillips Mark Phillips MarkPhillips Martin Kaiser @@ -157,5 +163,6 @@ Wido Kelling Widok Yang Luo hsluoyz Yang Luo Yang Luo Yaniv Kaul +Yasuyuki Tanaka Yasuyuki Tanaka Yasuyuki Tanaka Zhao Lin linzhao115 diff --git a/AUTHORS b/AUTHORS index d7e0e43b5c..c899177241 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4031,14 +4031,12 @@ Camille Guérin Carlos Velasco Cathy Yang Cedric Izoard -Cedric Izoard Cenk Gündoğan Chaitanya T K Charles Nepveu Charlie Lenahan Chema Gonzalez Chris Brandson -Chris Brandson Chris Dunlop Chris Wills Christian Ambach @@ -4197,11 +4195,12 @@ Juan Pablo Mendoza Julian Cable Julien STAUB Jun Wang +Junpei Yoshino Justin Helgesen JustinKu Jérôme LAFORGE Kary Rogers -KasperDeng +Kasper Deng Kenneth Soerensen Kenny Root Kevin Bracey @@ -4232,7 +4231,6 @@ Marcelo Ricardo Leitner Marcin Rokicki Marian Ďurkovič Marie Janssen -Marius Marius Paliga Mark Cunningham Mark Phillips