summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-02-02 15:02:12 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-02-02 15:02:12 -0500
commit35ade926241d0c92a059d082325ad3747a9e0324 (patch)
tree827084b6df3214c493247dbd4754b9776d6519ee /.mailmap
parent0aa683b97ce29f154e6657223cb90f0f2553978b (diff)
downloadenlightenment-35ade926241d0c92a059d082325ad3747a9e0324.tar.gz
update mailmap addresses
Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 1 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index d055df3ad3..0bb03a3289 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,9 +19,8 @@ Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
Christopher Michael <devilhorns@comcast.net> Christopher Michael <devilhorns@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>