merge: missing some informations changes about ecore

SVN revision: 79996

diff --git a/AUTHORS b/AUTHORS
index 63915c7..e96759c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -118,6 +118,72 @@ Leandro Dorileo (dorileo) <dorileo@profusion.mobi>
 Patryk Kaczmarek <patryk.k@samsung.com>
 Zbigniew Kosinski <z.kosinski@samsung.com>
 
+Ecore
+-----
+
+The Rasterman <raster@rasterman.com>
+Tom Gilbert <tom@linuxbrit.co.uk>
+Burra <burra@colorado.edu>
+Chris Ross <chris@darkrock.co.uk>
+Term <term@twistedpath.org>
+Tilman Sauerbeck <tilman@code-monkey.de>
+Ibukun Olumuyiwa <ibukun@computer.org>
+Yuri <da2001@hotmail.ru>
+Nicholas Curran <quasar@bigblue.net.au>
+Howell Tam <pigeon@pigeond.net>
+Nathan Ingersoll <rbdpngn@users.sourceforge.net>
+Andrew Elcock <andy@elcock.org>
+Kim Woelders <kim@woelders.dk>
+Sebastian Dransfeld <sd@tango.flipp.net>
+Simon Poole <simon.armlinux@themalago.net>
+Jorge Luis Zapata Muga <jorgeluis.zapata@gmail.com>
+dan sinclair <zero@everburning.com>
+Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+David 'onefang' Seikel <onefang@gmail.com>
+Hisham 'CodeWarrior' Mardam Bey <hisham@hisham.cc>
+Brian 'rephorm' Mattern <rephorm@rephorm.com>
+Tim Horton <hortont424@gmail.com>
+Arnaud de Turckheim 'quarium' <quarium@gmail.com>
+Matt Barclay <mbarclay@gmail.com>
+Peter Wehrfritz <peter.wehrfritz@web.de>
+Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
+Vincent Torri <vincent.torri@gmail.com>
+Lars Munch <lars@segv.dk>
+Andre Dieb <andre.dieb@gmail.com>
+Mathieu Taillefumier <mathieu.taillefumier@free.fr>
+Rui Miguel Silva Seabra <rms@1407.org>
+Samsung Electronics <tbd>
+Samsung SAIT <tbd>
+Nicolas Aguirre <aguirre.nicolas@gmail.com>
+Brett Nash <nash@nash.id.au>
+Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
+Leif Middelschulte <leif.middelschulte@gmail.com>
+Mike McCormack <mikem@ring3k.org>
+Sangho Park <gouache95@gmail.com>
+Jihoon Kim <jihoon48.kim@samsung.com> <imfine98@gmail.com>
+PnB <Poor.NewBie@gmail.com>
+Daniel Juyung Seo <seojuyung2@gmail.com> <juyung.seo@samsung.com>
+Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
+ChunEon Park (Hermet) <hermet@hermet.pe.kr>
+xlopez@igalia.com
+Rafael Antognolli <antognolli@profusion.mobi>
+Kim Yunhan <spbear@gmail.com>
+Youness Alaoui <kakaroto@kakaroto.homelinux.net>
+Bluezery <ohpowel@gmail.com>
+Doyoun Kang <wayofmine@gmail.com> <doyoun.kang@samsung.com>
+Haifeng Deng <haifeng.deng@samsung.com>
+Jérémy Zurcher <jeremy@asynk.ch>
+Seong-ho Cho (DarkCircle) <darkcircle.0426@gmail.com>
+Patryk Kaczmarek <patryk.k@samsung.com>
+Daniel Willmann <d.willmann@samsung.com>
+Michal Pakula vel Rutka <m.pakula@samsung.com>
+Vikram Narayanan <vikram186@gmail.com>
+Daniel Zaoui <daniel.zaoui@samsung.com>
+Yakov Goldberg <yakov.g@samsung.com>
+Eduardo Lima (Etrunko) <eblima@gmail.com>
+Alexey Yakovenko <wakeroid@gmail.com>
+Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
+
 Embryo
 ------
 

diff --git a/COPYING b/COPYING
index 32df97f..0af3e57 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -7,4 +7,5 @@ eet:             licenses/COPYING.BSD
 eina:            licenses/COPYING.LGPL
 eo:              licenses/COPYING.BSD
 evas:            licenses/COPYING.BSD
+ecore:           licenses/COPYING.BSD
 embryo:          licenses/COPYING.SMALL

diff --git a/legacy/ecore/ChangeLog b/old/ChangeLog.ecore
similarity index 100%
rename from legacy/ecore/ChangeLog
rename to old/ChangeLog.ecore

diff --git a/legacy/ecore/NEWS b/old/NEWS.ecore
similarity index 100%
rename from legacy/ecore/NEWS
rename to old/NEWS.ecore

diff --git a/legacy/ecore/README b/old/README.ecore
similarity index 100%
rename from legacy/ecore/README
rename to old/README.ecore