billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=02a7a4e4d52ef8d77e7e3811103740e0de71d8e0
commit 02a7a4e4d52ef8d77e7e3811103740e0de71d8e0
Author: Boris Faure <bill...@gmail.com>
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 <michael.blumenkra...@gmail.com> Mike
Blumenkrantz <m.blumenkr
Mike Blumenkrantz <michael.blumenkra...@gmail.com> discomfitor
<michael.blumenkra...@gmail.com>
Mike Blumenkrantz <michael.blumenkra...@gmail.com> zmike
<michael.blumenkra...@gmail.com>
Mike Blumenkrantz <michael.blumenkra...@gmail.com> Mike Blumenkrantz
<zm...@samsung.com>
+Mike Blumenkrantz <michael.blumenkra...@gmail.com> Mike Blumenkrantz
<zm...@osg.samsung.com>
ChunEon Park <her...@hermet.pe.kr> ChunEon Park <chuneon.p...@samsung.com>
David Walter Seikel <onef...@gmail.com> David Walter Seikel
<won_f...@yahoo.com.au>
Rafael Antognolli <antogno...@gmail.com> Rafael Antognolli
<rafael.antogno...@intel.com>
@@ -76,3 +77,6 @@ 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>
Lee Gwang-O <mae...@live.co.kr> Gwang O Lee <pu8...@gmail.com>
+Thibaut Broggi <brogg...@epitech.eu> broggi_t <brogg...@epitech.eu>
+Daniel Zaoui <daniel.za...@samsung.com> Daniel Zaoui <daniel.za...@yahoo.com>
+Jérémy Anger <angerj....@gmail.com> kidanger <angerj....@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 964233e..97d20c3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,51 +1,56 @@
-Carsten Haitzler <ras...@rasterman.com>
Boris Faure <bill...@gmail.com>
+Carsten Haitzler <ras...@rasterman.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>
Christopher Michael <devilho...@comcast.net>
+Daniel Juyung Seo <seojuyu...@gmail.com>
Panagiotis Galatsanos <galatsan...@gmail.com>
-Aleksandar Popadić <aleksandar.popa...@siol.net>
Mike Blumenkrantz <michael.blumenkra...@gmail.com>
+Aleksandar Popadić <aleksandar.popa...@siol.net>
Massimo Maiurana <maiur...@gmail.com>
Stefan Schmidt <ste...@datenfreihafen.org>
Davide Andreoli <d...@gurumeditation.it>
Gustavo Lima Chaves <gl...@profusion.mobi>
+Jean-Philippe ANDRÉ <j...@videolan.org>
Tom Hacohen <t...@stosb.com>
Alex-P. Natsios <drak...@2f30.org>
Lee Gwang-O <mae...@live.co.kr>
-Jean-Philippe ANDRÉ <j...@videolan.org>
+Jean Guyomarc'h <jean.guyoma...@gmail.com>
Jihoon Kim <imfin...@gmail.com>
+Kai Huuhko <kai.huu...@gmail.com>
Mike McCormack <m...@atratus.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>
+Thibaut Broggi <brogg...@epitech.eu>
Lucas De Marchi <lucas.demar...@profusion.mobi>
Marcel Hollerbach <marcel-hollerb...@t-online.de>
Anisse Astier <ani...@astier.eu>
+Daniel Zaoui <daniel.za...@samsung.com>
Doug Newgard <scimmi...@outlook.com>
Flavio Vinicius Alvares Ceolin <flavio.ceo...@profusion.mobi>
Samuel F. Baggen <thanaterme...@gmail.com>
Amitesh Singh <amitesh...@samsung.com>
Anthony F McInerney <afm...@gmail.com>
+Aurélien Larcher <aurelien.larc...@gmail.com>
Bruno Dilly <bdi...@profusion.mobi>
-Daniel Zaoui <daniel.za...@samsung.com>
+Conrad Meyer <@>
+Daniel Kolesa <dan...@octaforge.org>
Eduardo Lima <eduardo.l...@intel.com>
Flavio Ceolin <flavio.ceo...@intel.com>
Jason L. Cook <jason.lewis.c...@gmail.com>
+Jérémy Anger <angerj....@gmail.com>
Michael BOUCHAUD <michael.bouch...@gmail.com>
Michael Jennings <m...@kainx.org>
Nicholas Hughart <mek...@mekius.net>
Rafael Antognolli <antogno...@gmail.com>
Rui Seabra <r...@1407.org>
Sanjeev BA <iamsanj...@gmail.com>
+Theodor van Nahl <theo_...@van-nahl.org>
Vincent Torri <vincent.to...@gmail.com>
-Raphael Ahrens <tant.sinnis...@googlemail.com>
-Thibaut Broggi <brogg...@epitech.eu>
+tantSinnister <tant.sinnis...@googlemail.com>
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 "
--
