1 |
commit: dc37131a73c0292d1e936be46297e8b80999d8ec |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 30 20:54:54 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 30 20:54:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc37131a |
7 |
|
8 |
Update CONTRIBUTORS |
9 |
|
10 |
Punt 3 duplicates through mailmapping. |
11 |
|
12 |
.mailmap | 3 +++ |
13 |
Documentation/CONTRIBUTORS | 3 --- |
14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/.mailmap b/.mailmap |
17 |
index 1bc4b96..7d49c24 100644 |
18 |
--- a/.mailmap |
19 |
+++ b/.mailmap |
20 |
@@ -29,6 +29,7 @@ Manuel Rüger <mrueg@g.o> <mrueg@××××.eu> |
21 |
Marc Schiffbauer <mschiff@g.o> <marc@×××××××××××.net> |
22 |
Marcus D. Hanwell <cryos@g.o> <marcus@×××××.org> |
23 |
Markos Chandras <hwoarang@g.o> <hwoarang@×××××××××××.gr> |
24 |
+Michael Palimaka <kensington@g.o> <kensington@g.o> |
25 |
Michael Palimaka <kensington@g.o> <kensington@×××××××××××.net> |
26 |
Patrick Lauer <patrick@g.o> <bugs@××××××××××××××××××××××.org> |
27 |
Patrick Lauer <patrick@g.o> <patrick.lauer@××××××××××.net> |
28 |
@@ -49,3 +50,5 @@ Unknown <root@localhost> <root@××××××××××××.box> |
29 |
Unknown <root@localhost> <root@ronan-notebook.(none)> |
30 |
Unknown <root@localhost> <root@tux.(none)> |
31 |
Vadim A. Misbakh-Soloviev <mva@×××.name> <mva@×××.name> |
32 |
+Vadim A. Misbakh-Soloviev <mva@×××.name> <git@×××.name> |
33 |
+Vladimir Smirnov <civil.over@×××××.com> <civil.over@×××××.com> |
34 |
|
35 |
diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS |
36 |
index 33b5848..f38a098 100644 |
37 |
--- a/Documentation/CONTRIBUTORS |
38 |
+++ b/Documentation/CONTRIBUTORS |
39 |
@@ -107,12 +107,9 @@ Torgny Nyblom <kde@××××××.org> |
40 |
Unknown <root@localhost> |
41 |
Uwe L. Korn <uwelk@××××××.com> |
42 |
Vadim A. Misbakh-Soloviev <mva@×××.name> |
43 |
-Vadim A. Misbakh-Soloviov <git@×××.name> |
44 |
-Vladimir Civil Smirnov <civil.over@×××××.com> |
45 |
Vladimir Smirnov <civil.over@×××××.com> |
46 |
William <William@×××××××××.re> |
47 |
frames <markkuehn@×××××××.com> |
48 |
-kensington <kensington@g.o> |
49 |
krytzz <krytzz@×××××××.eu> |
50 |
puchu <puchu@×××.at> |
51 |
travlr <vel.accel@×××××.com> |