billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=02a7a4e4d52ef8d77e7e3811103740e0de71d8e0

commit 02a7a4e4d52ef8d77e7e3811103740e0de71d8e0
Author: Boris Faure <[email protected]>
Date:   Sat Sep 5 14:06:30 2015 +0200

    update contributors
---
 .mailmap        |  4 ++++
 AUTHORS         | 23 ++++++++++++++---------
 src/bin/about.c | 23 ++++++++++++++---------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.mailmap b/.mailmap
index ccfbda2..d9d6852 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Mike Blumenkrantz <[email protected]> Mike 
Blumenkrantz <m.blumenkr
 Mike Blumenkrantz <[email protected]> discomfitor 
<[email protected]>
 Mike Blumenkrantz <[email protected]> zmike 
<[email protected]>
 Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
+Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
 ChunEon Park <[email protected]> ChunEon Park <[email protected]>
 David Walter Seikel <[email protected]> David Walter Seikel 
<[email protected]>
 Rafael Antognolli <[email protected]> Rafael Antognolli 
<[email protected]>
@@ -76,3 +77,6 @@ Wonguk Jeong <[email protected]> wonguk.jeong 
<[email protected]>
 Kai Huuhko <[email protected]> Kai Huuhko <[email protected]>
 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]>
+Jérémy Anger <[email protected]> kidanger <[email protected]>
diff --git a/AUTHORS b/AUTHORS
index 964233e..97d20c3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,51 +1,56 @@
-Carsten Haitzler <[email protected]>
 Boris Faure <[email protected]>
+Carsten Haitzler <[email protected]>
 Gustavo Sverzut Barbieri <[email protected]>
 Cedric BAIL <[email protected]>
 Sebastian Dransfeld <[email protected]>
 Wonguk Jeong <[email protected]>
-Daniel Juyung Seo <[email protected]>
 Christopher Michael <[email protected]>
+Daniel Juyung Seo <[email protected]>
 Panagiotis Galatsanos <[email protected]>
-Aleksandar Popadić <[email protected]>
 Mike Blumenkrantz <[email protected]>
+Aleksandar Popadić <[email protected]>
 Massimo Maiurana <[email protected]>
 Stefan Schmidt <[email protected]>
 Davide Andreoli <[email protected]>
 Gustavo Lima Chaves <[email protected]>
+Jean-Philippe ANDRÉ <[email protected]>
 Tom Hacohen <[email protected]>
 Alex-P. Natsios <[email protected]>
 Lee Gwang-O <[email protected]>
-Jean-Philippe ANDRÉ <[email protected]>
+Jean Guyomarc'h <[email protected]>
 Jihoon Kim <[email protected]>
+Kai Huuhko <[email protected]>
 Mike McCormack <[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]>
+Thibaut Broggi <[email protected]>
 Lucas De Marchi <[email protected]>
 Marcel Hollerbach <[email protected]>
 Anisse Astier <[email protected]>
+Daniel Zaoui <[email protected]>
 Doug Newgard <[email protected]>
 Flavio Vinicius Alvares Ceolin <[email protected]>
 Samuel F. Baggen <[email protected]>
 Amitesh Singh <[email protected]>
 Anthony F McInerney <[email protected]>
+Aurélien Larcher <[email protected]>
 Bruno Dilly <[email protected]>
-Daniel Zaoui <[email protected]>
+Conrad Meyer <@>
+Daniel Kolesa <[email protected]>
 Eduardo Lima <[email protected]>
 Flavio Ceolin <[email protected]>
 Jason L. Cook <[email protected]>
+Jérémy Anger <[email protected]>
 Michael BOUCHAUD <[email protected]>
 Michael Jennings <[email protected]>
 Nicholas Hughart <[email protected]>
 Rafael Antognolli <[email protected]>
 Rui Seabra <[email protected]>
 Sanjeev BA <[email protected]>
+Theodor van Nahl <[email protected]>
 Vincent Torri <[email protected]>
-Raphael Ahrens <[email protected]>
-Thibaut Broggi <[email protected]>
+tantSinnister <[email protected]>
diff --git a/src/bin/about.c b/src/bin/about.c
index ea7fde0..670f63e 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -70,57 +70,62 @@ about_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object 
*term,
               "%s" // LICENSE
               ),
               PACKAGE_VERSION, 2015,
-              "Carsten Haitzler<br>"
               "Boris Faure<br>"
+              "Carsten Haitzler<br>"
               "Gustavo Sverzut Barbieri<br>"
               "Cedric BAIL<br>"
               "Sebastian Dransfeld<br>"
               "Wonguk Jeong<br>"
-              "Daniel Juyung Seo<br>"
               "Christopher Michael<br>"
+              "Daniel Juyung Seo<br>"
               "Panagiotis Galatsanos<br>"
-              "Aleksandar Popadić<br>"
               "Mike Blumenkrantz<br>"
+              "Aleksandar Popadić<br>"
               "Massimo Maiurana<br>"
               "Stefan Schmidt<br>"
               "Davide Andreoli<br>"
               "Gustavo Lima Chaves<br>"
+              "Jean-Philippe ANDRÉ<br>"
               "Tom Hacohen<br>"
               "Alex-P. Natsios<br>"
               "Lee Gwang-O<br>"
-              "Jean-Philippe ANDRÉ<br>"
+              "Jean Guyomarc'h<br>"
               "Jihoon Kim<br>"
+              "Kai Huuhko<br>"
               "Mike McCormack<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>"
+              "Thibaut Broggi<br>"
               "Lucas De Marchi<br>"
               "Marcel Hollerbach<br>"
               "Anisse Astier<br>"
+              "Daniel Zaoui<br>"
               "Doug Newgard<br>"
               "Flavio Vinicius Alvares Ceolin<br>"
               "Samuel F. Baggen<br>"
               "Amitesh Singh<br>"
               "Anthony F McInerney<br>"
+              "Aurélien Larcher<br>"
               "Bruno Dilly<br>"
-              "Daniel Zaoui<br>"
+              "Conrad Meyer<br>"
+              "Daniel Kolesa<br>"
               "Eduardo Lima<br>"
               "Flavio Ceolin<br>"
               "Jason L. Cook<br>"
+              "Jérémy Anger<br>"
               "Michael BOUCHAUD<br>"
               "Michael Jennings<br>"
               "Nicholas Hughart<br>"
               "Rafael Antognolli<br>"
               "Rui Seabra<br>"
               "Sanjeev BA<br>"
+              "Theodor van Nahl<br>"
               "Vincent Torri<br>"
-              "Raphael Ahrens<br>"
-              "Thibaut Broggi<br>",
+              "tantSinnister<br>",
               "All rights reserved.<br>"
               "<br>"
               "Redistribution and use in source and binary forms, with or "

-- 


Reply via email to