annotate .mailmap @ 2916:ae6cdcd69d9f default tip

Merge with upstream/master.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 14 May 2019 11:46:50 +0300
parents 92494a7432e9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2547
893368786ef8 Adding mailmap file to unify commiter
Klaus Ethgen <Klaus@Ethgen.de>
parents:
diff changeset
1 <xsdg@xsdg.org> <xsdg@google.com>
2649
1636031e5f27 Fixing changelog generation
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2549
diff changeset
2 <colin.clark@cclark.uk> <cclark@mcb.net>
1636031e5f27 Fixing changelog generation
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2549
diff changeset
3 Colin Clark <colin.clark@cclark.uk>
2547
893368786ef8 Adding mailmap file to unify commiter
Klaus Ethgen <Klaus@Ethgen.de>
parents:
diff changeset
4 <johne@verizon.net> John Ellis <gqview@users.sf.net>
893368786ef8 Adding mailmap file to unify commiter
Klaus Ethgen <Klaus@Ethgen.de>
parents:
diff changeset
5 <zas@norz.org> Laurent Monin <geeqie@norz.org>
893368786ef8 Adding mailmap file to unify commiter
Klaus Ethgen <Klaus@Ethgen.de>
parents:
diff changeset
6 <mschwendt@fedoraproject.org> <mschwendt@gmail.com>
2548
f8c2095b60d6 Update mailmap
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2547
diff changeset
7 <michal@cihar.com> <mcihar@suse.cz>
f8c2095b60d6 Update mailmap
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2547
diff changeset
8 <michal@cihar.com> <nijel@debian.org>
2846
f508172c17fa Updating mailmap to map to correct user
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2649
diff changeset
9 <jrs+git@weitnahbei.de> <sixtyfive@users.noreply.github.com>
2549
c2089f525b2e Adding more Entries to mailmap
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2548
diff changeset
10 Morgan Hardwood <entertheyoni@gmail.com>
c2089f525b2e Adding more Entries to mailmap
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2548
diff changeset
11 Rezső Páder <rezso@rezso.net>
2877
92494a7432e9 Bug fix: Extra characters in mailmap
Colin Clark <colin.clark@cclark.uk>
parents: 2846
diff changeset
12 Olaf Seibert <rhialto@falu.nl>
2846
f508172c17fa Updating mailmap to map to correct user
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2649
diff changeset
13 <niko@nava.de> <nikoss@users.noreply.github.com>