osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

.mailmap: Update .mailmap for fix some name / duplicate entry 

Change-Id: If0ea60700dab808f1b2851396190df55e470c60a
Reviewed-on: https://code.wireshark.org/review/8732
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2015-06-02 10:09:57 +02:00 committed by Anders Broman
parent 4c3677ef3b
commit 7907b82863
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.mailmap
View File

@ -1,8 +1,11 @@
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>
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>
Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden
Dave Tapuska <dtapuska@google.com> dave@tapuska.com>
@ -23,15 +26,19 @@ 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>
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
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>
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
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
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
@ -41,8 +48,11 @@ Remi Vichery <remi.vichery@gmail.com>
Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
Robert Grange <robionekenobi@bluewin.ch> robioneknobi
Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
Stephen Donnelly <stephen.donnelly@emulex.com> sfd
Stephen Fisher <sfisher@sdf.org> <stephenfisher@centurylink.net>
Stephen Fisher <sfisher@sdf.org> <stephenfisher-wireshark@outlook.com>
Stephen Fisher <sfisher@sdf.org> <steve@stephen-fisher.com>
warrenm <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
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>