From 4d4575382ca868882881ddd9bad240f85f8a6a75 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Sun, 5 Oct 2014 15:04:49 +0200
Subject: [PATCH] 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 0a1c2013..4408ceb6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@ Cedric BAIL <cedric.bail@free.fr> Cedric Bail <cedric.bail@samsung.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric.bail@samsung.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric Bail <cedric.bail@free.fr>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@efl.so>
+Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <c.bail@partner.samsung.com>
+Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
 Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
 Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
 Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
@@ -56,7 +58,19 @@ Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gma
 Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
 Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
+Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
+Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
+Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
+Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
+Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
+Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> q66 <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> q66 <d.kolesa@samsung.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel Kolesa <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel 'q66' Kolesa <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel 'q66' Kolesa <d.kolesa@samsung.com>
 Wonguk Jeong <wonguk.jeong@samsung.com> Wonguk Jeong <huchijwk@gmail.com>
 Wonguk Jeong <wonguk.jeong@samsung.com> wonguk.jeong <wonguk.jeong@samsung.com>
 Kai Huuhko <kai.huuhko@gmail.com> Kai Huuhko <k.huuhko@partner.samsung.com>
+Massimo Maiurana <maiurana@gmail.com> maxerba <maiurana@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 47b2ee91..ff8cd21d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,40 +3,41 @@ Boris Faure <billiob@gmail.com>
 Gustavo Sverzut Barbieri <barbieri@gmail.com>
 Cedric BAIL <cedric.bail@free.fr>
 Sebastian Dransfeld <sd@tango.flipp.net>
+Wonguk Jeong <wonguk.jeong@samsung.com>
 Daniel Juyung Seo <seojuyung2@gmail.com>
-Aleksandar Popadić <aleksandar.popadic@siol.net>
 Christopher Michael <devilhorns@comcast.net>
+Panagiotis Galatsanos <galatsanosp@gmail.com>
+Aleksandar Popadić <aleksandar.popadic@siol.net>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
 Davide Andreoli <dave@gurumeditation.it>
 Gustavo Lima Chaves <glima@profusion.mobi>
 Stefan Schmidt <stefan@datenfreihafen.org>
 Tom Hacohen <tom@stosb.com>
-Panagiotis Galatsanos <galatsanosp@gmail.com>
+Alex-P. Natsios <drakevr@2f30.org>
+Massimo Maiurana <maiurana@gmail.com>
+Gwang O Lee <pu8046@gmail.com>
+Jean-Philippe ANDRÉ <jpeg@videolan.org>
 Jihoon Kim <imfine98@gmail.com>
 Mike McCormack <mike@atratus.org>
-Wonguk Jeong <wonguk.jeong@samsung.com>
-Jean-Philippe ANDRÉ <jpeg@videolan.org>
+Iván Briano <ivan.briano@intel.com>
+Jean Guyomarc'h <jean.guyomarch@gmail.com>
 Jerome Pinot <ngc891@gmail.com>
 José Roberto de Souza <zehortigoza@profusion.mobi>
+Kai Huuhko <kai.huuhko@gmail.com>
 Leandro Pereira <leandro@profusion.mobi>
 Leif Middelschulte <leif.middelschulte@gmail.com>
 Markus Törnqvist <mjt@fadconsulting.com>
-Massimo Maiurana <maiurana@gmail.com>
-Jean Guyomarc'h <jean.guyomarch@gmail.com>
 Lucas De Marchi <lucas.demarchi@profusion.mobi>
 Marcel Hollerbach <marcel-hollerbach@t-online.de>
+Anisse Astier <anisse@astier.eu>
 Doug Newgard <scimmia22@outlook.com>
 Flavio Vinicius Alvares Ceolin <flavio.ceolin@profusion.mobi>
 Samuel F. Baggen <thanatermesis@gmail.com>
-Alex-P. Natsios <drakevr@2f30.org>
 Amitesh Singh <amitesh.sh@samsung.com>
-Anisse Astier <anisse@astier.eu>
 Bruno Dilly <bdilly@profusion.mobi>
-Cedric BAIL <c.bail@partner.samsung.com>
 Daniel Zaoui <daniel.zaoui@samsung.com>
 Eduardo Lima <eduardo.lima@intel.com>
 Flavio Ceolin <flavio.ceolin@intel.com>
-Iván Briano <ivan.briano@intel.com>
 Jason L. Cook <jason.lewis.cook@gmail.com>
 Michael BOUCHAUD <michael.bouchaud@gmail.com>
 Michael Jennings <mej@kainx.org>
diff --git a/src/bin/about.c b/src/bin/about.c
index 880342a3..aae50e5f 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>"