billiob pushed a commit to branch master.

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

commit 4d4575382ca868882881ddd9bad240f85f8a6a75
Author: Boris Faure <[email protected]>
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 <[email protected]> Cedric Bail 
<[email protected]>
 Cedric BAIL <[email protected]> Cedric BAIL <[email protected]>
 Cedric BAIL <[email protected]> Cedric Bail <[email protected]>
 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]>
 Tom Hacohen <[email protected]> Tom 'TAsn' Hacohen <[email protected]>
 Tom Hacohen <[email protected]> Tom <[email protected]>
@@ -56,7 +58,19 @@ Samuel F. Baggen <[email protected]> Thanatermesis 
<thanatermesis.ecvs@gma
 Jean Guyomarc'h <[email protected]> Jean GUYOMARC'H 
<[email protected]>
 Marcel Hollerbach <[email protected]> Marcel Hollerbach 
<[email protected]>
 Jean-Philippe ANDRÉ <[email protected]> Jean-Philippe Andre 
<[email protected]>
+Jean-Philippe ANDRÉ <[email protected]> Jean-Philippe ANDRE <[email protected]>
 Jean-Philippe ANDRÉ <[email protected]> Jean-Philippe Andre <[email protected]>
+Amitesh Singh <[email protected]> Amitesh Singh <[email protected]>
+Amitesh Singh <[email protected]> ami <[email protected]>
+Amitesh Singh <[email protected]> Amitesh Singh <[email protected]>
+Tae-Hwan Kim <[email protected]> bluezery <[email protected]>
+Tae-Hwan Kim <[email protected]> Bluezery <[email protected]>
+Daniel Kolesa <[email protected]> q66 <[email protected]>
+Daniel Kolesa <[email protected]> q66 <[email protected]>
+Daniel Kolesa <[email protected]> Daniel Kolesa <[email protected]>
+Daniel Kolesa <[email protected]> Daniel 'q66' Kolesa <[email protected]>
+Daniel Kolesa <[email protected]> Daniel 'q66' Kolesa <[email protected]>
 Wonguk Jeong <[email protected]> Wonguk Jeong <[email protected]>
 Wonguk Jeong <[email protected]> wonguk.jeong <[email protected]>
 Kai Huuhko <[email protected]> Kai Huuhko <[email protected]>
+Massimo Maiurana <[email protected]> maxerba <[email protected]>
diff --git a/AUTHORS b/AUTHORS
index 47b2ee9..ff8cd21 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,40 +3,41 @@ Boris Faure <[email protected]>
 Gustavo Sverzut Barbieri <[email protected]>
 Cedric BAIL <[email protected]>
 Sebastian Dransfeld <[email protected]>
+Wonguk Jeong <[email protected]>
 Daniel Juyung Seo <[email protected]>
-Aleksandar Popadić <[email protected]>
 Christopher Michael <[email protected]>
+Panagiotis Galatsanos <[email protected]>
+Aleksandar Popadić <[email protected]>
 Mike Blumenkrantz <[email protected]>
 Davide Andreoli <[email protected]>
 Gustavo Lima Chaves <[email protected]>
 Stefan Schmidt <[email protected]>
 Tom Hacohen <[email protected]>
-Panagiotis Galatsanos <[email protected]>
+Alex-P. Natsios <[email protected]>
+Massimo Maiurana <[email protected]>
+Gwang O Lee <[email protected]>
+Jean-Philippe ANDRÉ <[email protected]>
 Jihoon Kim <[email protected]>
 Mike McCormack <[email protected]>
-Wonguk Jeong <[email protected]>
-Jean-Philippe ANDRÉ <[email protected]>
+Iván Briano <[email protected]>
+Jean Guyomarc'h <[email protected]>
 Jerome Pinot <[email protected]>
 José Roberto de Souza <[email protected]>
+Kai Huuhko <[email protected]>
 Leandro Pereira <[email protected]>
 Leif Middelschulte <[email protected]>
 Markus Törnqvist <[email protected]>
-Massimo Maiurana <[email protected]>
-Jean Guyomarc'h <[email protected]>
 Lucas De Marchi <[email protected]>
 Marcel Hollerbach <[email protected]>
+Anisse Astier <[email protected]>
 Doug Newgard <[email protected]>
 Flavio Vinicius Alvares Ceolin <[email protected]>
 Samuel F. Baggen <[email protected]>
-Alex-P. Natsios <[email protected]>
 Amitesh Singh <[email protected]>
-Anisse Astier <[email protected]>
 Bruno Dilly <[email protected]>
-Cedric BAIL <[email protected]>
 Daniel Zaoui <[email protected]>
 Eduardo Lima <[email protected]>
 Flavio Ceolin <[email protected]>
-Iván Briano <[email protected]>
 Jason L. Cook <[email protected]>
 Michael BOUCHAUD <[email protected]>
 Michael Jennings <[email protected]>
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