diff options
| author | Jaehwan Kim <jae.hwan.kim@samsung.com> | 2012-08-14 20:16:49 +0900 |
|---|---|---|
| committer | Jaehwan Kim <jae.hwan.kim@samsung.com> | 2012-08-14 20:16:49 +0900 |
| commit | 369903c98c6617ef2e5cdc04eeccf2e247c55593 (patch) | |
| tree | 9b46d6703655da49f39e70baad85e461b6f393c1 /AUTHORS | |
| parent | 98e51da6aef8546815e41c47f814b1659e914710 (diff) | |
| download | evas-369903c98c6617ef2e5cdc04eeccf2e247c55593.tar.gz evas-369903c98c6617ef2e5cdc04eeccf2e247c55593.tar.bz2 evas-369903c98c6617ef2e5cdc04eeccf2e247c55593.zip | |
Revert "Revert "Upstream merge""
This reverts commit 91d469f4d69d875b6f5ae87c87465f50f63ad87d.
Conflicts:
ChangeLog
NEWS
packaging/evas.spec
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -32,5 +32,7 @@ Youness Alaoui <kakaroto@kakaroto.homelinux.net> Jim Kukunas <james.t.kukunas@linux.intel.com> Nicolas Aguirre <aguirre.nicolas@gmail.com> Rafal Krypa <r.krypa@samsung.com> -Yoyoung Chang <hyoyoung@gmail.com> +Hyoyoung Chang <hyoyoung@gmail.com> Jérôme Pinot <ngc891@gmail.com> +Rafael Antognolli <antognolli@profusion.mobi> +Daniel Zaoui <daniel.zaoui@samsung.com> |