Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
[metze/wireshark/wip.git] / .mailmap
1 Anders Broman <anders.broman@ericsson.com> <a.broman58@gmail.com>
2 Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com>
3 Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net>
4 Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
5 Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
6 Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org>
7 Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden
8 Dave Tapuska <dtapuska@google.com> dave@tapuska.com>
9 David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
10 Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
11 Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
12 Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
13 Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
14 Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
15 Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost>
16 Irene Rüngeler <ruengeler@wireshark.org> Irene Ruengeler <ruengeler@wireshark.org>
17 Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org>
18 Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de>
19 Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@MacBookIrene.local>
20 Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@localhost>
21 Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl>
22 Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com>
23 Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com>
24 Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
25 Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at>
26 Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.com>
27 Marcel Essig <marcel.essig@gmx.de> <essig.marcel@gmail.com>
28 Marian Ďurkovič <md@bts.sk> Marian Durkovic
29 Martin Kaiser <wireshark@kaiser.cx> <martin@reykholt.kaiser.cx>
30 Martin Kaiser <wireshark@kaiser.cx> <martin@skogar.kaiser.cx>
31 Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
32 Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
33 Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
34 Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
35 Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
36 Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com>
37 Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com>
38 Remi Vichery <remi.vichery@gmail.com>
39 Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
40 Robert Grange <robionekenobi@bluewin.ch> robioneknobi
41 Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
42 Stephen Fisher <sfisher@sdf.org> <stephenfisher@centurylink.net>
43 Stephen Fisher <sfisher@sdf.org> <stephenfisher-wireshark@outlook.com>
44 Stephen Fisher <sfisher@sdf.org> <steve@stephen-fisher.com>
45 warrenm <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
46 Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>