summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2018-01-16 14:51:29 -0800
committerJohn Dickinson <me@not.mn>2018-02-02 12:09:20 -0800
commitf4cfe81e593b52e11e67916073a050cd2dde2e00 (patch)
tree0d0c92538e4553c03ad69e27b0170f9c8575c0a0 /.mailmap
parentc97459b54aa150fbd7aa590b42a5bada3a5a5198 (diff)
downloadswift-f4cfe81e593b52e11e67916073a050cd2dde2e00.tar.gz
authors/changelog updates for 2.17.0 release
Change-Id: I577d169022916676a20a9ac24c7cc7b63ae46778
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 6e0c02d52..26dc285c6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -95,7 +95,8 @@ Mehdi Abaakouk <sileht@redhat.com> <mehdi.abaakouk@enovance.com>
Richard Hawkins <richard.hawkins@rackspace.com> <hurricanerix@gmail.com>
Ondrej Novy <ondrej.novy@firma.seznam.cz>
Ondrej Novy <ondrej.novy@firma.seznam.cz> <novy@ondrej.org>
-Peter Lisak <peter.lisak@firma.seznam.cz>
+Peter Lisák <peter.lisak@gmail.com> <peter.lisak@firma.seznam.cz>
+Peter Lisák <peter.lisak@gmail.com> Peter Lisák <peter.lisak@firma.seznam.cz>
Ke Liang <ke.liang@easystack.cn>
Daisuke Morita <morita.daisuke@ntti3.com> <morita.daisuke@lab.ntt.co.jp>
Andreas Jaeger <aj@suse.de> <aj@suse.com>