billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=4d4575382ca868882881ddd9bad240f85f8a6a75

commit 4d4575382ca868882881ddd9bad240f85f8a6a75
Author: Boris Faure <bill...@gmail.com>
Date:   Sun Oct 5 15:04:49 2014 +0200

    update contributors
---
 .mailmap        | 14 ++++++++++++++
 AUTHORS         | 21 +++++++++++----------
 src/bin/about.c | 21 +++++++++++----------
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0a1c201..4408ceb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@ Cedric BAIL <cedric.b...@free.fr> Cedric Bail 
<cedric.b...@samsung.com>
 Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <cedric.b...@samsung.com>
 Cedric BAIL <cedric.b...@free.fr> Cedric Bail <cedric.b...@free.fr>
 Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <ced...@efl.so>
+Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <c.b...@partner.samsung.com>
+Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <ced...@osg.samsung.com>
 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>
@@ -56,7 +58,19 @@ Samuel F. Baggen <thanaterme...@gmail.com> Thanatermesis 
<thanatermesis.ecvs@gma
 Jean Guyomarc'h <jean.guyoma...@gmail.com> Jean GUYOMARC'H 
<jean.guyoma...@gmail.com>
 Marcel Hollerbach <marcel-hollerb...@t-online.de> Marcel Hollerbach 
<marcel.hollerb...@stzedn.de>
 Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe Andre 
<jp.an...@samsung.com>
+Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe ANDRE <j...@videolan.org>
 Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe Andre <j...@videolan.org>
+Amitesh Singh <amitesh...@samsung.com> Amitesh Singh <amitesh...@samsung.com>
+Amitesh Singh <amitesh...@samsung.com> ami <singh.amit...@gmail.com>
+Amitesh Singh <amitesh...@samsung.com> Amitesh Singh <singh.amit...@gmail.com>
+Tae-Hwan Kim <the81....@samsung.com> bluezery <ohpo...@gmail.com>
+Tae-Hwan Kim <the81....@samsung.com> Bluezery <ohpo...@gmail.com>
+Daniel Kolesa <d.kol...@samsung.com> q66 <quake...@gmail.com>
+Daniel Kolesa <d.kol...@samsung.com> q66 <d.kol...@samsung.com>
+Daniel Kolesa <d.kol...@samsung.com> Daniel Kolesa <quake...@gmail.com>
+Daniel Kolesa <d.kol...@samsung.com> Daniel 'q66' Kolesa <quake...@gmail.com>
+Daniel Kolesa <d.kol...@samsung.com> Daniel 'q66' Kolesa <d.kol...@samsung.com>
 Wonguk Jeong <wonguk.je...@samsung.com> Wonguk Jeong <huchi...@gmail.com>
 Wonguk Jeong <wonguk.je...@samsung.com> wonguk.jeong <wonguk.je...@samsung.com>
 Kai Huuhko <kai.huu...@gmail.com> Kai Huuhko <k.huu...@partner.samsung.com>
+Massimo Maiurana <maiur...@gmail.com> maxerba <maiur...@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 47b2ee9..ff8cd21 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,40 +3,41 @@ Boris Faure <bill...@gmail.com>
 Gustavo Sverzut Barbieri <barbi...@gmail.com>
 Cedric BAIL <cedric.b...@free.fr>
 Sebastian Dransfeld <s...@tango.flipp.net>
+Wonguk Jeong <wonguk.je...@samsung.com>
 Daniel Juyung Seo <seojuyu...@gmail.com>
-Aleksandar Popadić <aleksandar.popa...@siol.net>
 Christopher Michael <devilho...@comcast.net>
+Panagiotis Galatsanos <galatsan...@gmail.com>
+Aleksandar Popadić <aleksandar.popa...@siol.net>
 Mike Blumenkrantz <michael.blumenkra...@gmail.com>
 Davide Andreoli <d...@gurumeditation.it>
 Gustavo Lima Chaves <gl...@profusion.mobi>
 Stefan Schmidt <ste...@datenfreihafen.org>
 Tom Hacohen <t...@stosb.com>
-Panagiotis Galatsanos <galatsan...@gmail.com>
+Alex-P. Natsios <drak...@2f30.org>
+Massimo Maiurana <maiur...@gmail.com>
+Gwang O Lee <pu8...@gmail.com>
+Jean-Philippe ANDRÉ <j...@videolan.org>
 Jihoon Kim <imfin...@gmail.com>
 Mike McCormack <m...@atratus.org>
-Wonguk Jeong <wonguk.je...@samsung.com>
-Jean-Philippe ANDRÉ <j...@videolan.org>
+Iván Briano <ivan.bri...@intel.com>
+Jean Guyomarc'h <jean.guyoma...@gmail.com>
 Jerome Pinot <ngc...@gmail.com>
 José Roberto de Souza <zehortig...@profusion.mobi>
+Kai Huuhko <kai.huu...@gmail.com>
 Leandro Pereira <lean...@profusion.mobi>
 Leif Middelschulte <leif.middelschu...@gmail.com>
 Markus Törnqvist <m...@fadconsulting.com>
-Massimo Maiurana <maiur...@gmail.com>
-Jean Guyomarc'h <jean.guyoma...@gmail.com>
 Lucas De Marchi <lucas.demar...@profusion.mobi>
 Marcel Hollerbach <marcel-hollerb...@t-online.de>
+Anisse Astier <ani...@astier.eu>
 Doug Newgard <scimmi...@outlook.com>
 Flavio Vinicius Alvares Ceolin <flavio.ceo...@profusion.mobi>
 Samuel F. Baggen <thanaterme...@gmail.com>
-Alex-P. Natsios <drak...@2f30.org>
 Amitesh Singh <amitesh...@samsung.com>
-Anisse Astier <ani...@astier.eu>
 Bruno Dilly <bdi...@profusion.mobi>
-Cedric BAIL <c.b...@partner.samsung.com>
 Daniel Zaoui <daniel.za...@samsung.com>
 Eduardo Lima <eduardo.l...@intel.com>
 Flavio Ceolin <flavio.ceo...@intel.com>
-Iván Briano <ivan.bri...@intel.com>
 Jason L. Cook <jason.lewis.c...@gmail.com>
 Michael BOUCHAUD <michael.bouch...@gmail.com>
 Michael Jennings <m...@kainx.org>
diff --git a/src/bin/about.c b/src/bin/about.c
index 880342a..aae50e5 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -75,40 +75,41 @@ about_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object 
*term,
               "Gustavo Sverzut Barbieri<br>"
               "Cedric BAIL<br>"
               "Sebastian Dransfeld<br>"
+              "Wonguk Jeong<br>"
               "Daniel Juyung Seo<br>"
-              "Aleksandar Popadić<br>"
               "Christopher Michael<br>"
+              "Panagiotis Galatsanos<br>"
+              "Aleksandar Popadić<br>"
               "Mike Blumenkrantz<br>"
               "Davide Andreoli<br>"
               "Gustavo Lima Chaves<br>"
               "Stefan Schmidt<br>"
               "Tom Hacohen<br>"
-              "Panagiotis Galatsanos<br>"
+              "Alex-P. Natsios<br>"
+              "Massimo Maiurana<br>"
+              "Gwang O Lee<br>"
+              "Jean-Philippe ANDRÉ<br>"
               "Jihoon Kim<br>"
               "Mike McCormack<br>"
-              "Wonguk Jeong<br>"
-              "Jean-Philippe ANDRÉ<br>"
+              "Iván Briano<br>"
+              "Jean Guyomarc'h<br>"
               "Jerome Pinot<br>"
               "José Roberto de Souza<br>"
+              "Kai Huuhko<br>"
               "Leandro Pereira<br>"
               "Leif Middelschulte<br>"
               "Markus Törnqvist<br>"
-              "Massimo Maiurana<br>"
-              "Jean Guyomarc'h<br>"
               "Lucas De Marchi<br>"
               "Marcel Hollerbach<br>"
+              "Anisse Astier<br>"
               "Doug Newgard<br>"
               "Flavio Vinicius Alvares Ceolin<br>"
               "Samuel F. Baggen<br>"
-              "Alex-P. Natsios<br>"
               "Amitesh Singh<br>"
-              "Anisse Astier<br>"
               "Bruno Dilly<br>"
-              "Cedric BAIL<br>"
               "Daniel Zaoui<br>"
               "Eduardo Lima<br>"
               "Flavio Ceolin<br>"
-              "Iván Briano<br>"
               "Jason L. Cook<br>"
               "Michael BOUCHAUD<br>"
               "Michael Jennings<br>"

-- 


Reply via email to