diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-08-17 13:27:53 +0200 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-19 01:37:21 +0000 |
| commit | a22bb87d7be41ce9d91dfad12e973067d69b3049 (patch) | |
| tree | 6c791c9af249f3fb4477910ac8b251bb33e963e3 | |
| parent | c32c1f060842d9411bdb94be564638c52a2d7942 (diff) | |
Update .mailmap
Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5
Reviewed-on: https://code.wireshark.org/review/10068
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
| -rw-r--r-- | .mailmap | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -1,23 +1,31 @@ +Alexander Gärtner <sphinxs1988@googlemail.com> alage <sphinxs1988@googlemail.com> Alexander Wetzel <alexander.wetzel@web.de> deagol Anders Broman <anders.broman@ericsson.com> <a.broman58@gmail.com> Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com> Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net> Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com> Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com> +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> Chris Dunlop <chris.dunlop3@gmail.com> cjdunlop Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org> +Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de> +Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@gmail.com> Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden Dave Tapuska <dtapuska@google.com> dave@tapuska.com> David Ameiss <dameiss@29west.com> <netshark@ameissnet.com> Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr> +Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com> Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org> Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com> +Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com> Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com> Gerald Combs <gerald@wireshark.org> <gerald@zing.org> Hadriel Kaplan <hadrielk@yahoo.com> <hadriel@128technology.com> Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost> -Hitesh K. Maisheri <maisheri.hitesh@gmail.com> <hmaisher@cisco.com> +Hitesh K Maisheri <maisheri.hitesh@gmail.com> <hmaisher@cisco.com> +Hitesh K Maisheri <maisheri.hitesh@gmail.com> maisheri <maisheri.hitesh@gmail.com> Irene Rüngeler <ruengeler@wireshark.org> Irene Ruengeler <ruengeler@wireshark.org> Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org> Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de> @@ -26,9 +34,11 @@ Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@localhost> Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl> Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com> +Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com> Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com> Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com> Jorge Power <jpower@rsscorp.org> jorge power +Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com> Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at> Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.com> Marcel Essig <marcel.essig@gmx.de> <essig.marcel@gmail.com> @@ -36,11 +46,14 @@ Marian Ďurkovič <md@bts.sk> Marian Durkovic Martin Kaiser <wireshark@kaiser.cx> <martin@reykholt.kaiser.cx> Martin Kaiser <wireshark@kaiser.cx> <martin@skogar.kaiser.cx> Martin Tibensky <martin.tibensky@alcatel-lucent.com> matibens +Martin Tibensky <martin.tibensky@alcatel-lucent.com> Mato <tibensky233@gmail.com> Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local> Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de> Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz +Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru> Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost> +Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com> Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au> Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com> Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com> @@ -56,3 +69,4 @@ Stephen Fisher <sfisher@sdf.org> <steve@stephen-fisher.com> Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com> Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)> Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com> +Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com> |