summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-03-18 21:13:14 +0100
committerJohannes Huber <johu@gentoo.org>2017-03-18 21:13:31 +0100
commit297c31963407b576b881eec57042fd861303b026 (patch)
treec9f179e9936f1dc256be433088bb0df2d9be45a2
parent60d29b50ebef6fdc968b708e9048c0e58e438285 (diff)
downloadkde-297c31963407b576b881eec57042fd861303b026.tar.gz
kde-297c31963407b576b881eec57042fd861303b026.tar.bz2
kde-297c31963407b576b881eec57042fd861303b026.zip
Update mailmap
-rw-r--r--.mailmap2
-rw-r--r--Documentation/CONTRIBUTORS2
2 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index c0247f109ac..03e2433a7dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,8 @@ Dror Levin <spatz@gentoo.org> <spatz@psybear.com>
Fabio Erculiani <lxnay@gentoo.org> <lxnay@sabayon.org>
Fabio Erculiani <lxnay@gentoo.org> <lxnay@sabayonlinux.org>
Ian Delaney <idell5@iinet.com.au> <della5@iinet.com.au>
+Jan Kundrát <jkt@kde.org> <jkt@flaska.net>
+Jason A. Donenfeld <zx2c4@gentoo.org> <Jason@zx2c4.com>
Johannes Huber <johu@gentoo.org> <johu@gmx.de>
Jonathan Callen <jcallen@gentoo.org> <en.ABCD@gmail.com>
Jonathan Callen <jcallen@gentoo.org> <abcd@gentoo.org>
diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS
index a2b974b7a70..2539b9b81d1 100644
--- a/Documentation/CONTRIBUTORS
+++ b/Documentation/CONTRIBUTORS
@@ -48,9 +48,7 @@ Ian Whyman <thev00d00@gentoo.org>
Ilya Tumaykin <itumaykin@gmail.com>
Jakub Caban <kuba@whyblack.pl>
James Le Cuirot <chewi@gentoo.org>
-Jan Kundrát <jkt@flaska.net>
Jan Kundrát <jkt@kde.org>
-Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld <zx2c4@gentoo.org>
Jean-Baptiste Rouault <jbrouault@gmail.com>
Jekyll Wu <adaptee@gmail.com>