cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5f178387112f9250bc57be252b1e4456a250a05a

commit 5f178387112f9250bc57be252b1e4456a250a05a
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Mon Mar 28 16:30:41 2016 -0700

    elementary: merge AUTHORS
---
 AUTHORS                   | 174 ++++++++++++++++++++++++++++++++++++++++++++++
 legacy/elementary/AUTHORS | 171 ---------------------------------------------
 2 files changed, 174 insertions(+), 171 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a3b0e1e..57b08ef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -359,6 +359,180 @@ ELua
 ----
 Daniel Kolesa <quake...@gmail.com>
 
+Elementary
+----------
+The Rasterman (Carsten Haitzler) <ras...@rasterman.com>
+Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
+Cedric Bail <cedric.b...@free.fr>
+Vincent Torri <vto...@univ-evry.fr>
+Daniel Kolesa <quake...@gmail.com>
+Jaime Thomas <avi.tho...@gmail.com>
+Swisscom - http://www.swisscom.ch/
+Christopher Michael <devilho...@comcast.net>
+Marco Trevisan (Treviño) <m...@3v1n0.net>
+Michael Bouchaud <michael.bouch...@gmail.com>
+Jonathan Atton (Watchwolf) <jonathan.at...@gmail.com>
+Brian Wang <brian.wang.0...@gmail.com>
+Mike Blumenkrantz (discomfitor/zmike) <michael.blumenkra...@gmail.com>
+Samsung Electronics <tbd>
+Samsung SAIT <tbd>
+Brett Nash <n...@nash.id.au>
+Bruno Dilly <bdi...@profusion.mobi>
+Rafael Fonseca <rfons...@profusion.mobi>
+Hermet Park <her...@hermet.pe.kr>
+Woohyun Jung <wh0705.j...@samsung.com>
+Jaehwan Kim <jae.hwan....@samsung.com>
+Wonguk Jeong <wonguk.je...@samsung.com>
+Leandro A. F. Pereira <lean...@profusion.mobi>
+Helen Fornazier <helen.fornaz...@profusion.mobi>
+Gustavo Lima Chaves <gl...@profusion.mobi>
+Fabiano Fidêncio <fiden...@profusion.mobi>
+Tiago Falcão <ti...@profusion.mobi>
+Otavio Pontes <ota...@profusion.mobi>
+Viktor Kojouharov <vkojouha...@gmail.com>
+Daniel Juyung Seo (SeoZ) <juyung....@samsung.com> <seojuyu...@gmail.com>
+Sangho Park <sangho.g.p...@samsung.com> <gouach...@gmail.com>
+Rajeev Ranjan (Rajeev) <rajee...@samsung.com> <rajeev.jn...@gmail.com>
+Seunggyun Kim <sgyun....@samsung.com> <tmd...@gmail.com>
+Sohyun Kim <anna1014....@samsung.com> <sohyun.a...@gmail.com>
+Jihoon Kim <jihoon48....@samsung.com>
+Jeonghyun Yun (arosis) <jh0506....@samsung.com>
+Tom Hacohen <t...@stosb.com>
+Aharon Hillel <a.hil...@samsung.com>
+Shinwoo Kim <kimci...@gmail.com>
+Govindaraju SM <govi...@samsung.com> <gov...@gmail.com>
+Prince Kumar Dubey <prince.du...@samsung.com> <prince.du...@gmail.com>
+Sung W. Park <sung...@gmail.com>
+Thierry el Borgi <thie...@substantiel.fr>
+Shilpa Singh <shilpa.si...@samsung.com> <shilpasing...@gmail.com>
+Chanwook Jung <joey.j...@samsung.com> <jchanw...@gmail.com>
+Hyoyoung Chang <hyoyoung.ch...@samsung.com>
+Guillaume "Kuri" Friloux <guillaume.fril...@asp64.com>
+Kim Yunhan <spb...@gmail.com>
+Tae-Hwan Kim (Bluezery) <the81....@samsung.com> <ohpo...@gmail.com>
+Nicolas Aguirre <aguirre.nico...@gmail.com>
+Sanjeev BA <iamsanj...@gmail.com>
+Hyunsil Park <hyunsil.p...@samsung.com>
+Goun Lee <gouni....@samsung.com>
+Mikael Sans <sans.mik...@gmail.com>
+Doyoun Kang <doyoun.k...@samsung.com>
+M.V.K. Sumanth <sumant...@samsung.com> <mvksuma...@gmail.com>
+Jérôme Pinot <ngc...@gmail.com>
+Davide Andreoli <d...@gurumeditation.it>
+Michal Pakula vel Rutka <m.pak...@samsung.com>
+Thiep Ha <thiep...@samsung.com>
+Artem Popov <artem.po...@samsung.com>
+Minseok Kim <minseok3....@samsung.com>
+Jean-Philippe André <j...@videolan.org>
+JiHyeon Seol <jihyeon.s...@samsung.com>
+Flavio Ceolin <flavio.ceo...@profusion.mobi>
+Igor Murzov <e-m...@date.by>
+Jiyoun Park <jy0703.p...@samsung.com>
+KoziarekBeata <b.kozia...@samsung.com>
+Daniel Zaoui <daniel.za...@samsung.com>
+Yakov Goldberg <yako...@samsung.com>
+Murilo Belluzzo <murilo.bellu...@profusion.mobi>
+Ricardo de Almeida Gonzaga <rica...@profusion.mobi>
+Gwanglim Lee <gl77....@samsung.com> <gwang...@gmail.com>
+JaeHyun Cho <jae_hyun_...@naver.com>
+Bora Hwang <bora1.hw...@samsung.com>
+Jiyoung Choi <jychoi7.c...@samsung.com>
+Arvind R <arvin...@gmail.com>
+Paulo Cavalcanti <paulo.cavalca...@linux.intel.com>
+Stefan Schmidt <ste...@datenfreihafen.org>
+Ryuan Choi (ryuan) <ryuan.c...@samsung.com> <ryuan.c...@gmail.com>
+Hosang Kim <hosang12....@samsung.com>
+Youngbok Shin <youngb.s...@samsung.com>
+Niraj Kumar <niraj...@samsung.com> <niraj.kumar....@gmail.com>
+Amitesh Singh <singh.amit...@gmail.com>
+Abhinandan Aryadipta <a.aryadi...@samsung.com>
+Sanghyeon Lee <sh10233....@samsung.com>
+Anil Kumar Nahak <ak.na...@samsung.com>
+Michal Jagiello <m.jagie...@samsung.com>
+Chinmaya Panigrahi <c.panigr...@samsung.com>
+Mohammad Irfan <mohamma...@samsung.com>
+ajwillia.ms (Andrew Williams) <a...@andywilliams.me>
+Iván Briano <sachi...@gmail.com>
+Jonas M. Gastal <jgas...@profusion.mobi>
+Rafael Antognolli <antogno...@gmail.com>
+Mike McCormack <m...@atratus.org>
+Massimo Maiurana <maiur...@gmail.com>
+Henrique Dante de Almeida <hda...@profusion.mobi>
+Lucas De Marchi <lucas.demar...@profusion.mobi>
+Boris Faure <bill...@gmail.com>
+Sebastian Dransfeld <s...@tango.flipp.net>
+Daniel Willmann <dan...@totalueberwachung.de>
+maxerba <maiur...@gmail.com>
+Youness Alaoui <kakar...@kakaroto.homelinux.net>
+Rui Seabra <r...@1407.org>
+Andreas Volz <li...@brachttal.net>
+Jaeun Choi <jaeun12.c...@samsung.com>
+Doug Newgard <scimmi...@outlook.com>
+José Roberto de Souza <zehortig...@profusion.mobi>
+Luis Felipe Strano Moraes <lfel...@profusion.mobi>
+Thiago Thamada <t...@profusion.mobi>
+U. Artie Eoff <ullysses.a.e...@intel.com>
+Daniel Hirt <daniel.h...@samsung.com>
+Eduardo Lima <eduardo.l...@intel.com>
+Leif Middelschulte <leif.middelschu...@gmail.com>
+Lukasz Stanislawski <l.stanisl...@samsung.com>
+Stephen Houston <smhousto...@gmail.com>
+Andrii Kroitor <an.kroi...@samsung.com>
+Joao Paulo Fernandes Ventura <vent...@profusion.mobi>
+Pau Espin Pedrol <pespin.s...@gmail.com>
+Jérémy Zurcher <jer...@asynk.ch>
+Kai Huuhko <kai.huu...@gmail.com>
+Leandro Dorileo <dori...@profusion.mobi>
+Michael Jennings <m...@kainx.org>
+Myungjae Lee <mjae....@samsung.com>
+Tristan Lelong <tristan.lel...@blunderer.org>
+Yossi Kantor <yossi.kan...@samsung.com>
+cabelitos <guilherme.isc...@intel.com>
+Alex Wu <zhiwen...@linux.intel.com>
+Alex-P. Natsios <drak...@linuxteam.teilar.gr>
+Aron Xu <happyaron...@gmail.com>
+Chidambar Zinnoury <illog...@online.fr>
+Christophe Sadoine <ch...@indefini.org>
+Daniel Vieira Franzolin <dan...@profusion.mobi>
+Daniele Ricci <daniele.ath...@gmail.com>
+David Walter Seikel <onef...@gmail.com>
+Dennis Schridde <devuran...@gmx.net>
+Hannes Janetzek <hannes.janet...@gmail.com>
+Lionel Landwerlin <llandwer...@gmail.com>
+Mariusz Bialonczyk <ma...@skyboo.net>
+Martin Jansa <martin.ja...@gmail.com>
+Michael Lauer <mla...@vanille-media.de>
+Mike Frysinger <vap...@gentoo.org>
+Rodrigo Cesar Lopes Belem <rclbe...@gmail.com>
+Seong-ho Cho <darkcircle.0...@gmail.com>
+Seunghun Lee <shiin....@samsung.com>
+Thanatermesis <thanatermesis.e...@gmail.com>
+Viacheslav Lvov <v.l...@samsung.com>
+Deasung Kim <deasung....@samsung.com>
+Jeonghoon Park <jh1979.p...@samsung.com>
+Prashant <pb.ing...@samsung.com>
+suxia li <suxia...@samsung.com>
+yan.wang <yan.w...@linux.intel.com>
+Anand <anand...@samsung.com>
+Subhransu Sekhar Mohanty <sub.moha...@samsung.com>
+Rajesh P S <rajes...@samsung.com>
+Srivardhan Hebbar <sri.heb...@samsung.com>
+Savio Sena <sa...@expertisesolutions.com.br>
+Jae Yong Hwang <j_yong.hw...@samsung.com>
+Kabeer Khan <kabeer.k...@samsung.com>
+yinsc <shouchen....@samsung.com>
+Woochan Lee <wc0917....@samsung.com>
+Vitalii Vorobiov <vi.vorob...@samsung.com>
+Jee-Yong Um <con...@gmail.com>
+Ji-In Moon <jiin.m...@samsung.com> 
+Subodh Kumar <s7158.ku...@samsung.com>
+Kumar Navneet <k.navn...@samsung.com>
+Godly T Alias <godly.tal...@samsung.com> <godlytal...@yahoo.co.in>
+Shashank Pandey <shashan...@samsung.com> <shashank0...@gmail.com>
+Divyesh Purohit <div.puro...@samsung.com> <purohit....@gmail.com>
+Minkyu Kang <mk7.k...@samsung.com>
+Jinyong Park <j4939.p...@samsung.com>
+
 Merged EFL
 ----------
 Michael Jennings <m...@kainx.org>
diff --git a/legacy/elementary/AUTHORS b/legacy/elementary/AUTHORS
deleted file mode 100644
index 4b5522f..0000000
--- a/legacy/elementary/AUTHORS
+++ /dev/null
@@ -1,171 +0,0 @@
-The Rasterman (Carsten Haitzler) <ras...@rasterman.com>
-Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
-Cedric Bail <cedric.b...@free.fr>
-Vincent Torri <vto...@univ-evry.fr>
-Daniel Kolesa <quake...@gmail.com>
-Jaime Thomas <avi.tho...@gmail.com>
-Swisscom - http://www.swisscom.ch/
-Christopher Michael <devilho...@comcast.net>
-Marco Trevisan (Treviño) <m...@3v1n0.net>
-Michael Bouchaud <michael.bouch...@gmail.com>
-Jonathan Atton (Watchwolf) <jonathan.at...@gmail.com>
-Brian Wang <brian.wang.0...@gmail.com>
-Mike Blumenkrantz (discomfitor/zmike) <michael.blumenkra...@gmail.com>
-Samsung Electronics <tbd>
-Samsung SAIT <tbd>
-Brett Nash <n...@nash.id.au>
-Bruno Dilly <bdi...@profusion.mobi>
-Rafael Fonseca <rfons...@profusion.mobi>
-Hermet Park <her...@hermet.pe.kr>
-Woohyun Jung <wh0705.j...@samsung.com>
-Jaehwan Kim <jae.hwan....@samsung.com>
-Wonguk Jeong <wonguk.je...@samsung.com>
-Leandro A. F. Pereira <lean...@profusion.mobi>
-Helen Fornazier <helen.fornaz...@profusion.mobi>
-Gustavo Lima Chaves <gl...@profusion.mobi>
-Fabiano Fidêncio <fiden...@profusion.mobi>
-Tiago Falcão <ti...@profusion.mobi>
-Otavio Pontes <ota...@profusion.mobi>
-Viktor Kojouharov <vkojouha...@gmail.com>
-Daniel Juyung Seo (SeoZ) <juyung....@samsung.com> <seojuyu...@gmail.com>
-Sangho Park <sangho.g.p...@samsung.com> <gouach...@gmail.com>
-Rajeev Ranjan (Rajeev) <rajee...@samsung.com> <rajeev.jn...@gmail.com>
-Seunggyun Kim <sgyun....@samsung.com> <tmd...@gmail.com>
-Sohyun Kim <anna1014....@samsung.com> <sohyun.a...@gmail.com>
-Jihoon Kim <jihoon48....@samsung.com>
-Jeonghyun Yun (arosis) <jh0506....@samsung.com>
-Tom Hacohen <t...@stosb.com>
-Aharon Hillel <a.hil...@samsung.com>
-Shinwoo Kim <kimci...@gmail.com>
-Govindaraju SM <govi...@samsung.com> <gov...@gmail.com>
-Prince Kumar Dubey <prince.du...@samsung.com> <prince.du...@gmail.com>
-Sung W. Park <sung...@gmail.com>
-Thierry el Borgi <thie...@substantiel.fr>
-Shilpa Singh <shilpa.si...@samsung.com> <shilpasing...@gmail.com>
-Chanwook Jung <joey.j...@samsung.com> <jchanw...@gmail.com>
-Hyoyoung Chang <hyoyoung.ch...@samsung.com>
-Guillaume "Kuri" Friloux <guillaume.fril...@asp64.com>
-Kim Yunhan <spb...@gmail.com>
-Tae-Hwan Kim (Bluezery) <the81....@samsung.com> <ohpo...@gmail.com>
-Nicolas Aguirre <aguirre.nico...@gmail.com>
-Sanjeev BA <iamsanj...@gmail.com>
-Hyunsil Park <hyunsil.p...@samsung.com>
-Goun Lee <gouni....@samsung.com>
-Mikael Sans <sans.mik...@gmail.com>
-Doyoun Kang <doyoun.k...@samsung.com>
-M.V.K. Sumanth <sumant...@samsung.com> <mvksuma...@gmail.com>
-Jérôme Pinot <ngc...@gmail.com>
-Davide Andreoli <d...@gurumeditation.it>
-Michal Pakula vel Rutka <m.pak...@samsung.com>
-Thiep Ha <thiep...@samsung.com>
-Artem Popov <artem.po...@samsung.com>
-Minseok Kim <minseok3....@samsung.com>
-Jean-Philippe André <j...@videolan.org>
-JiHyeon Seol <jihyeon.s...@samsung.com>
-Flavio Ceolin <flavio.ceo...@profusion.mobi>
-Igor Murzov <e-m...@date.by>
-Jiyoun Park <jy0703.p...@samsung.com>
-KoziarekBeata <b.kozia...@samsung.com>
-Daniel Zaoui <daniel.za...@samsung.com>
-Yakov Goldberg <yako...@samsung.com>
-Murilo Belluzzo <murilo.bellu...@profusion.mobi>
-Ricardo de Almeida Gonzaga <rica...@profusion.mobi>
-Gwanglim Lee <gl77....@samsung.com> <gwang...@gmail.com>
-JaeHyun Cho <jae_hyun_...@naver.com>
-Bora Hwang <bora1.hw...@samsung.com>
-Jiyoung Choi <jychoi7.c...@samsung.com>
-Arvind R <arvin...@gmail.com>
-Paulo Cavalcanti <paulo.cavalca...@linux.intel.com>
-Stefan Schmidt <ste...@datenfreihafen.org>
-Ryuan Choi (ryuan) <ryuan.c...@samsung.com> <ryuan.c...@gmail.com>
-Hosang Kim <hosang12....@samsung.com>
-Youngbok Shin <youngb.s...@samsung.com>
-Niraj Kumar <niraj...@samsung.com> <niraj.kumar....@gmail.com>
-Amitesh Singh <singh.amit...@gmail.com>
-Abhinandan Aryadipta <a.aryadi...@samsung.com>
-Sanghyeon Lee <sh10233....@samsung.com>
-Anil Kumar Nahak <ak.na...@samsung.com>
-Michal Jagiello <m.jagie...@samsung.com>
-Chinmaya Panigrahi <c.panigr...@samsung.com>
-Mohammad Irfan <mohamma...@samsung.com>
-ajwillia.ms (Andrew Williams) <a...@andywilliams.me>
-Iván Briano <sachi...@gmail.com>
-Jonas M. Gastal <jgas...@profusion.mobi>
-Rafael Antognolli <antogno...@gmail.com>
-Mike McCormack <m...@atratus.org>
-Massimo Maiurana <maiur...@gmail.com>
-Henrique Dante de Almeida <hda...@profusion.mobi>
-Lucas De Marchi <lucas.demar...@profusion.mobi>
-Boris Faure <bill...@gmail.com>
-Sebastian Dransfeld <s...@tango.flipp.net>
-Daniel Willmann <dan...@totalueberwachung.de>
-maxerba <maiur...@gmail.com>
-Youness Alaoui <kakar...@kakaroto.homelinux.net>
-Rui Seabra <r...@1407.org>
-Andreas Volz <li...@brachttal.net>
-Jaeun Choi <jaeun12.c...@samsung.com>
-Doug Newgard <scimmi...@outlook.com>
-José Roberto de Souza <zehortig...@profusion.mobi>
-Luis Felipe Strano Moraes <lfel...@profusion.mobi>
-Thiago Thamada <t...@profusion.mobi>
-U. Artie Eoff <ullysses.a.e...@intel.com>
-Daniel Hirt <daniel.h...@samsung.com>
-Eduardo Lima <eduardo.l...@intel.com>
-Leif Middelschulte <leif.middelschu...@gmail.com>
-Lukasz Stanislawski <l.stanisl...@samsung.com>
-Stephen Houston <smhousto...@gmail.com>
-Andrii Kroitor <an.kroi...@samsung.com>
-Joao Paulo Fernandes Ventura <vent...@profusion.mobi>
-Pau Espin Pedrol <pespin.s...@gmail.com>
-Jérémy Zurcher <jer...@asynk.ch>
-Kai Huuhko <kai.huu...@gmail.com>
-Leandro Dorileo <dori...@profusion.mobi>
-Michael Jennings <m...@kainx.org>
-Myungjae Lee <mjae....@samsung.com>
-Tristan Lelong <tristan.lel...@blunderer.org>
-Yossi Kantor <yossi.kan...@samsung.com>
-cabelitos <guilherme.isc...@intel.com>
-Alex Wu <zhiwen...@linux.intel.com>
-Alex-P. Natsios <drak...@linuxteam.teilar.gr>
-Aron Xu <happyaron...@gmail.com>
-Chidambar Zinnoury <illog...@online.fr>
-Christophe Sadoine <ch...@indefini.org>
-Daniel Vieira Franzolin <dan...@profusion.mobi>
-Daniele Ricci <daniele.ath...@gmail.com>
-David Walter Seikel <onef...@gmail.com>
-Dennis Schridde <devuran...@gmx.net>
-Hannes Janetzek <hannes.janet...@gmail.com>
-Lionel Landwerlin <llandwer...@gmail.com>
-Mariusz Bialonczyk <ma...@skyboo.net>
-Martin Jansa <martin.ja...@gmail.com>
-Michael Lauer <mla...@vanille-media.de>
-Mike Frysinger <vap...@gentoo.org>
-Rodrigo Cesar Lopes Belem <rclbe...@gmail.com>
-Seong-ho Cho <darkcircle.0...@gmail.com>
-Seunghun Lee <shiin....@samsung.com>
-Thanatermesis <thanatermesis.e...@gmail.com>
-Viacheslav Lvov <v.l...@samsung.com>
-Deasung Kim <deasung....@samsung.com>
-Jeonghoon Park <jh1979.p...@samsung.com>
-Prashant <pb.ing...@samsung.com>
-suxia li <suxia...@samsung.com>
-yan.wang <yan.w...@linux.intel.com>
-Anand <anand...@samsung.com>
-Subhransu Sekhar Mohanty <sub.moha...@samsung.com>
-Rajesh P S <rajes...@samsung.com>
-Srivardhan Hebbar <sri.heb...@samsung.com>
-Savio Sena <sa...@expertisesolutions.com.br>
-Jae Yong Hwang <j_yong.hw...@samsung.com>
-Kabeer Khan <kabeer.k...@samsung.com>
-yinsc <shouchen....@samsung.com>
-Woochan Lee <wc0917....@samsung.com>
-Vitalii Vorobiov <vi.vorob...@samsung.com>
-Jee-Yong Um <con...@gmail.com>
-Ji-In Moon <jiin.m...@samsung.com> 
-Subodh Kumar <s7158.ku...@samsung.com>
-Kumar Navneet <k.navn...@samsung.com>
-Godly T Alias <godly.tal...@samsung.com> <godlytal...@yahoo.co.in>
-Shashank Pandey <shashan...@samsung.com> <shashank0...@gmail.com>
-Divyesh Purohit <div.puro...@samsung.com> <purohit....@gmail.com>
-Minkyu Kang <mk7.k...@samsung.com>
-Jinyong Park <j4939.p...@samsung.com>

-- 


Reply via email to