[EGIT] [core/enlightenment] master 01/01: update mailmap addresses

2016-02-02 Thread Chris Michael
devilhorns pushed a commit to branch master.

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

commit 35ade926241d0c92a059d082325ad3747a9e0324
Author: Chris Michael 
Date:   Tue Feb 2 15:02:12 2016 -0500

update mailmap addresses

Signed-off-by: Chris Michael 
---
 .mailmap | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index d055df3..0bb03a3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,9 +19,8 @@ Tom Hacohen  Tom 
 Gustavo Sverzut Barbieri  Gustavo Sverzut Barbieri 

 Christopher Michael  Christopher Michael 

 Christopher Michael  Christopher Michael 

-Christopher Michael  Christopher Michael 

-Christopher Michael  Christopher Michael 

 Christopher Michael  Christopher Michael 

+Christopher Michael  Christopher Michael 

 Sebastian Dransfeld  Sebastian Dransfeld 

 Sebastian Dransfeld  sebastid 
 Mike Blumenkrantz  Mike Blumenkrantz 


-- 




[EGIT] [core/enlightenment] master 01/01: update mailmap addresses

2016-02-02 Thread Chris Michael
devilhorns pushed a commit to branch master.

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

commit 0aa683b97ce29f154e6657223cb90f0f2553978b
Author: Chris Michael 
Date:   Tue Feb 2 14:03:07 2016 -0500

update mailmap addresses

Signed-off-by: Chris Michael 
---
 .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 Torri 

 Tom Hacohen  Tom 'TAsn' Hacohen 
 Tom Hacohen  Tom 
 Gustavo Sverzut Barbieri  Gustavo Sverzut Barbieri 

-Christopher Michael  Christopher Michael 

+Christopher Michael  Christopher Michael 

 Christopher Michael  Christopher Michael 

-Christopher Michael  Chris Michael 

-Christopher Michael  Chris Michael 

+Christopher Michael  Christopher Michael 

+Christopher Michael  Christopher Michael 

+Christopher Michael  Christopher Michael 

 Sebastian Dransfeld  Sebastian Dransfeld 

 Sebastian Dransfeld  sebastid 
 Mike Blumenkrantz  Mike Blumenkrantz 


-- 




[EGIT] [core/enlightenment] master 01/01: update mailmap

2015-09-05 Thread Boris Faure
billiob pushed a commit to branch master.

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

commit 095fa8e579a470d9d6cfce655be8a711c38977bf
Author: Boris Faure 
Date:   Sat Sep 5 13:55:50 2015 +0200

update mailmap
---
 .mailmap | 5 +
 1 file changed, 5 insertions(+)

diff --git a/.mailmap b/.mailmap
index 266bf43..d9d6852 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Mike Blumenkrantz  Mike 
Blumenkrantz  discomfitor 

 Mike Blumenkrantz  zmike 

 Mike Blumenkrantz  Mike Blumenkrantz 

+Mike Blumenkrantz  Mike Blumenkrantz 

 ChunEon Park  ChunEon Park 
 David Walter Seikel  David Walter Seikel 

 Rafael Antognolli  Rafael Antognolli 

@@ -75,3 +76,7 @@ Wonguk Jeong  Wonguk Jeong 

 Wonguk Jeong  wonguk.jeong 
 Kai Huuhko  Kai Huuhko 
 Massimo Maiurana  maxerba 
+Lee Gwang-O  Gwang O Lee 
+Thibaut Broggi  broggi_t 
+Daniel Zaoui  Daniel Zaoui 
+Jérémy Anger  kidanger 

--