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

Add .mailmap: fix duplicate/wrong e-mail or name in commit log 

It will be reused form generate AUTHORS file

Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Alexis La Goutte 2014-12-18 22:17:48 +01:00
parent 7e8a4b0927
commit 0b6adfc7d0
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.mailmap Normal file
View File

@ -0,0 +1,46 @@
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>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
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>
David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost>
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>
Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@MacBookIrene.local>
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>
Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.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>
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>
Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
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>
Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com>
Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com>
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>
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)>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>

1
Makefile.am
View File

@ -727,6 +727,7 @@ MAINTAINERCLEANFILES = \
ylwrap
EXTRA_DIST = \
.mailmap \
INSTALL.configure \
Makefile.am.inc \
Makefile.common \