From: Daniel Juyung Seo <juyung.seo@samsung.com>
Date: Mon, 7 Jun 2010 03:15:17 +0000 (+0900)
Subject: Merge with EFL svn repo
X-Git-Tag: 2.0_alpha~371
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=840d824c74ca7c1eb0c2a33ce96720f8adb52e50;p=framework%2Fuifw%2Fecore.git

Merge with EFL svn repo

Merge branch 'svn_merge'
---

840d824c74ca7c1eb0c2a33ce96720f8adb52e50
diff --cc src/lib/ecore_evas/ecore_evas_x.c
index 6ebe17e,c322f65..aa820fe
mode 100755,100644..100755
--- a/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c