billiob pushed a commit to branch master.

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

commit 4c3b0060b0d25e89db4bdd7e67c7cdaeb9e6bb21
Author: Boris Faure <bill...@gmail.com>
Date:   Sat Dec 7 17:17:41 2013 +0100

    update .mailmap
---
 .mailmap | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index c412505..94de859 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,10 @@
 # This cleans up all kind of different spellings, typos and different email
 # addresses for commit authors. It makes git shortlog statistics more 
meaningful.
-# 
+#
 # More people can be added following this scheme:
 # Proper Name <pro...@email.xx> Commit Name <com...@email.xx>
 #
-# Please keep this fiule in sync between efl, elementary and e.
+# Please keep this file in sync between efl, elementary, e and terminology.
 
 Carsten Haitzler <ras...@rasterman.com> Carsten Haitzler (Rasterman) 
<ras...@rasterman.com>
 Cedric BAIL <cedric.b...@free.fr> Cedric Bail <cedric.b...@samsung.com>
@@ -30,6 +30,7 @@ Rafael Antognolli <antogno...@gmail.com> Rafael Antognolli 
<rafael.antognolli@li
 Iván Briano <sachi...@gmail.com> Ivan Briano <ivan.bri...@intel.com>
 Iván Briano <sachi...@gmail.com> Ivan Briano <sachi...@gmail.com>
 Lucas De Marchi <lucas.demar...@profusion.mobi> Lucas De Marchi 
<lucas.de.mar...@gmail.com>
+Lucas De Marchi <lucas.demar...@profusion.mobi> Lucas De Marchi 
<lucas.demar...@intel.com>
 Jihoon Kim <imfin...@gmail.com> Jihoon Kim <jihoon48....@samsung.com>
 Stefan Schmidt <ste...@datenfreihafen.org> Stefan Schmidt 
<s.schm...@samsung.com>
 Jonas M. Gastal <jgas...@profusion.mobi> Jonas Gastal <jgas...@profusion.mobi>
@@ -45,3 +46,4 @@ Mike McCormack <m...@atratus.org> Mike McCormack 
<mj.mccorm...@samsung.com>
 Mike McCormack <m...@atratus.org> Mike McCormack <mi...@ring3k.org>
 Mike McCormack <m...@atratus.org> Mike McCormack <mi...@atratus.org>
 Boris Faure <bill...@gmail.com> Boris 'billiob' Faure <bill...@gmail.com>
+Eduardo Lima <eduardo.l...@intel.com> Eduardo Lima (Etrunko) 
<eduardo.l...@intel.com>

-- 


Reply via email to