discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c272ba77439173ed692c53bf1ec2f294054c59a7

commit c272ba77439173ed692c53bf1ec2f294054c59a7
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Tue Feb 2 14:03:07 2016 -0500

    update mailmap addresses
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 .mailmap | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index d9d6852..d055df3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,10 +17,11 @@ Vincent Torri <vincent.to...@gmail.com> Vincent Torri 
<vto...@univ-evry.fr>
 Tom Hacohen <t...@stosb.com> Tom 'TAsn' Hacohen <t...@stosb.com>
 Tom Hacohen <t...@stosb.com> Tom <t...@stosb.com>
 Gustavo Sverzut Barbieri <barbi...@gmail.com> Gustavo Sverzut Barbieri 
<barbi...@profusion.mobi>
-Christopher Michael <devilho...@comcast.net> Christopher Michael 
<cpmicha...@comcast.net>
+Christopher Michael <devilho...@comcast.net> Christopher Michael 
<cpmich...@comcast.net>
 Christopher Michael <devilho...@comcast.net> Christopher Michael 
<cp.mich...@samsung.com>
-Christopher Michael <devilho...@comcast.net> Chris Michael 
<cp.mich...@samsung.com>
-Christopher Michael <devilho...@comcast.net> Chris Michael 
<devilho...@comcast.net>
+Christopher Michael <devilho...@comcast.net> Christopher Michael 
<cpmich...@osg.samsung.com>
+Christopher Michael <devilho...@comcast.net> Christopher Michael 
<cp.mich...@samsung.com>
+Christopher Michael <devilho...@comcast.net> Christopher Michael 
<devilho...@comcast.net>
 Sebastian Dransfeld <s...@tango.flipp.net> Sebastian Dransfeld 
<sebastian.dransf...@sintef.no>
 Sebastian Dransfeld <s...@tango.flipp.net> sebastid <sebastid>
 Mike Blumenkrantz <michael.blumenkra...@gmail.com> Mike Blumenkrantz 
<m.blumenk...@samsung.com>

-- 


Reply via email to