diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-04 21:23:34 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-12 14:14:12 +0000 |
| commit | 4b9e481665b3c28c5730a8297ec984562f4a1728 (patch) | |
| tree | 6da50e7429c63d4f7cfe96c9b66e664371954adf | |
| parent | 0eaeb99f063c2fcf13108ebb60888f7f2077e793 (diff) | |
| download | wireshark-4b9e481665b3c28c5730a8297ec984562f4a1728.tar.gz | |
.mailmap: update (of April)
Change-Id: I74bf31ad4772966a292dde7a73a97d172c5121aa
Reviewed-on: https://code.wireshark.org/review/20909
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | AUTHORS | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -29,6 +29,7 @@ David Ameiss <dameiss@29west.com> <netshark@ameissnet.com> David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com> Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in> Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com> +Dhiru Kholia <kholia@kth.se> Dhiru Kholia <dhiru.kholia@gmail.com> Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr> Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com> Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru> @@ -60,6 +61,7 @@ Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.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> John Miner <optommp@gmail.com> John <optommp@gmail.com> @@ -4075,7 +4075,6 @@ Deep Datta <ddatta[AT]ixiacom.com> Denis Janssen <janssend[AT]gmail.com> Devin Heitmueller <dheitmueller[AT]kernellabs.com> Dhananjay Patki <dhpatki[AT]cisco.com> -Dhiru Kholia <dhiru.kholia[AT]gmail.com> Dhiru Kholia <kholia[AT]kth.se> DiablosOffens <DiablosOffens[AT]gmx.de> Didier Arenzana <darenzana[AT]yahoo.fr> @@ -4154,6 +4153,7 @@ Jeremy Hitt <jeremy.hitt[AT]isilon.com> Jeroen Roovers <jer[AT]gentoo.org> Jeroen Sack <jeroen[AT]jeroensack.nl> Jesse Gross <jesse[AT]kernel.org> +Jim Schaettle <jimschaettle[AT]gmail.com> Jim Young <jyoung[AT]gsu.edu> Jo Rueschel <wireshark[AT]rueschel.de> Joakim Karlsson <oakimk[AT]gmail.com> @@ -4244,7 +4244,6 @@ Mirko Parthey <mirko.parthey[AT]web.de> Moraney Jalil <moraney.jalil[AT]outlook.com> Moshe Kaplan <me[AT]moshekaplan.com> Nathan Cole <nath[AT]thecoleresidence.co.uk> -Nick <jimschaettle[AT]gmail.com> Nick Bedbury <npbedbur[AT]syr.edu> Nick Carter <ncarter100[AT]gmail.com> Nick Lowe <nick.lowe[AT]gmail.com> |