summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2017-04-19 11:14:58 -0500
committerJohn Dickinson <me@not.mn>2017-04-26 11:46:18 -0700
commit29e2edf8deb9e60d0a52c2d675eb7b6b64b183e9 (patch)
tree76aaf6c5d68703681cbe61548d04a642dfd0b0dd /.mailmap
parent1f540de0f1579291d33affe5345842b2dd2f1879 (diff)
downloadswift-29e2edf8deb9e60d0a52c2d675eb7b6b64b183e9.tar.gz
authors/changelog for 2.14.0
Change-Id: I0a6a8e4d62d2181e6d959437d6e84eeb2c29a05d
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index a7f6c3743..48d71b7db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -84,6 +84,7 @@ Atsushi Sakai <sakaia@jp.fujitsu.com>
Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
Nakagawa Masaaki <nakagawamsa@nttdata.co.jp> nakagawamsa
Romain Le Disez <romain.ledisez@ovh.net> Romain LE DISEZ
+Romain Le Disez <romain.ledisez@ovh.net> <romain.le-disez@corp.ovh.com>
Donagh McCabe <donagh.mccabe@gmail.com> <donagh.mccabe@hpe.com>
Donagh McCabe <donagh.mccabe@gmail.com> <donagh.mccabe@hp.com>
Eamonn O'Toole <eamonn.otoole@hpe.com> <eamonn.otoole@hp.com>