discomfitor pushed a commit to branch enlightenment-0.21.

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

commit 09ba7db93cb4ca0e056704923f162e744d83e87b
Author: Stefan Schmidt <[email protected]>
Date:   Thu Aug 4 12:46:40 2016 +0200

    mailmap: sync updated file from efl repo
---
 .mailmap | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 0bb03a3..68d4168 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,7 +4,7 @@
 # More people can be added following this scheme:
 # Proper Name <[email protected]> Commit Name <[email protected]>
 #
-# Please keep this file in sync between efl, elementary, e and terminology.
+# Please keep this file in sync between efl, e and terminology.
 
 Carsten Haitzler <[email protected]> Carsten Haitzler (Rasterman) 
<[email protected]>
 Cedric BAIL <[email protected]> Cedric Bail <[email protected]>
@@ -14,13 +14,20 @@ Cedric BAIL <[email protected]> Cedric BAIL 
<[email protected]>
 Cedric BAIL <[email protected]> Cedric BAIL <[email protected]>
 Cedric BAIL <[email protected]> Cedric BAIL <[email protected]>
 Vincent Torri <[email protected]> Vincent Torri <[email protected]>
+Vincent Torri <[email protected]> Vincent Torri <vincent dot torri at 
gmail dot com>
+Vincent Torri <[email protected]> Vincent Torri 
<[email protected]>
 Tom Hacohen <[email protected]> Tom 'TAsn' Hacohen <[email protected]>
 Tom Hacohen <[email protected]> Tom <[email protected]>
 Gustavo Sverzut Barbieri <[email protected]> Gustavo Sverzut Barbieri 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
+Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
+Christopher Michael <[email protected]> Chris Michael 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
+Christopher Michael <[email protected]> Christopher 
<[email protected]>
+Christopher Michael <[email protected]> Chris Michael 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
+Christopher Michael <[email protected]> Chris Michael 
<[email protected]>
 Sebastian Dransfeld <[email protected]> Sebastian Dransfeld 
<[email protected]>
 Sebastian Dransfeld <[email protected]> sebastid <sebastid>
 Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
@@ -29,6 +36,7 @@ Mike Blumenkrantz <[email protected]> zmike 
<michael.blumenkrantz@g
 Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
 Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
 ChunEon Park <[email protected]> ChunEon Park <[email protected]>
+ChunEon Park <[email protected]> Hermet Park <[email protected]>
 David Walter Seikel <[email protected]> David Walter Seikel 
<[email protected]>
 Rafael Antognolli <[email protected]> Rafael Antognolli 
<[email protected]>
 Rafael Antognolli <[email protected]> Rafael Antognolli 
<[email protected]>
@@ -38,6 +46,7 @@ Lucas De Marchi <[email protected]> Lucas De 
Marchi <lucas.de.marchi
 Lucas De Marchi <[email protected]> Lucas De Marchi 
<[email protected]>
 Jihoon Kim <[email protected]> Jihoon Kim <[email protected]>
 Stefan Schmidt <[email protected]> Stefan Schmidt 
<[email protected]>
+Stefan Schmidt <[email protected]> Stefan Schmidt 
<[email protected]>
 Jonas M. Gastal <[email protected]> Jonas Gastal <[email protected]>
 Daniel Juyung Seo <[email protected]> Daniel Juyung Seo 
<[email protected]>
 Daniel Juyung Seo <[email protected]> Daniel Juyung Seo 
<[email protected]>
@@ -79,4 +88,8 @@ Massimo Maiurana <[email protected]> maxerba 
<[email protected]>
 Lee Gwang-O <[email protected]> Gwang O Lee <[email protected]>
 Thibaut Broggi <[email protected]> broggi_t <[email protected]>
 Daniel Zaoui <[email protected]> Daniel Zaoui <[email protected]>
+Daniel Zaoui <[email protected]> [email protected] 
<[email protected]>
 Jérémy Anger <[email protected]> kidanger <[email protected]>
+Andy Williams <[email protected]> handyande <handyande>
+Davide Andreoli <[email protected]> Dave Andreoli <[email protected]>
+Davide Andreoli <[email protected]> davemds <[email protected]>

-- 


Reply via email to