summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-07-05 16:39:50 -0400
committerMonty Taylor <mordred@inaugust.com>2013-07-11 15:02:12 -0400
commit746b78d637724b369477270f518aa09768c5124e (patch)
tree1a75f247ce5ede1ab5277f490656734544f9a704 /.mailmap
parent295dbe1da3315d2f21acc02f0fce83e96224041e (diff)
downloadpbr-746b78d637724b369477270f518aa09768c5124e.tar.gz
Clean up hacking and path issues with d2to1
We imported in another code base. It takes a little bit of path adjusting to get things right. Change-Id: Ifb96652c822d5d243a6bedb77bc34e919be2d3a8
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 18221d4..373b96a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,6 @@
# Format is:
# <preferred e-mail> <other e-mail 1>
# <preferred e-mail> <other e-mail 2>
+Davanum Srinivas <dims@linux.vnet.ibm.com> <davanum@gmail.com>
+Erik M. Bray <embray@stsci.edu> Erik Bray <embray@stsci.edu>
Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>