summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2017-02-08 11:35:36 -0800
committerJohn Dickinson <me@not.mn>2017-02-15 16:16:49 -0800
commit11bd6c82ecac8572cf9538a4d92a0361b382f1de (patch)
tree20047df323380df8d17722dec9bacd2c95187b3d /.mailmap
parentcdd72dd34f879c7340d4c379db955ea82db3cfe2 (diff)
downloadswift-11bd6c82ecac8572cf9538a4d92a0361b382f1de.tar.gz
2.13.0 authors/changelog updates2.13.0
Change-Id: I4d90075bd1eb6775b9d736668aa9c7af5eb41f4e
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index becc2207a..718565fb2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -83,7 +83,8 @@ 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
-Donagh McCabe <donagh.mccabe@hpe.com> <donagh.mccabe@hp.com> <donagh.mccabe@gmail.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>
Gerry Drudy <gerry.drudy@hpe.com> <gerry.drudy@hp.com>
Mark Seger <mark.seger@hpe.com> <mark.seger@hp.com>
@@ -114,4 +115,5 @@ Cheng Li <shcli@cn.ibm.com>
Nandini Tata <nandini.tata@intel.com> <nandini.tata.15@gmail.com>
Flavio Percoco <flaper87@gmail.com>
Tin Lam <tinlam@gmail.com> <tl3438@att.com>
-Hisashi Osanai <osanai.hisashi@jp.fujitsu.com> <osanai.hisashi@gmail.com>
+Hisashi Osanai <osanai.hisashi@gmail.com> <osanai.hisashi@jp.fujitsu.com>
+Bryan Keller <kellerbr@us.ibm.com>