From: Jeonghyun Yun <jh0506.yun@samsung.com>
Date: Tue, 13 Mar 2012 02:23:06 +0000 (+0900)
Subject: Elementary migration revision 69026
X-Git-Tag: REL_F_I9500_20120317_1~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bc116926efa020b61dcf8663ffd784283a976b3;p=framework%2Fuifw%2Felementary.git

Elementary migration revision 69026
Merge remote-tracking branch 'remotes/origin/intefl/svn_merge'

Conflicts:
	src/lib/elm_index.c
	src/lib/elm_index.h
	src/lib/elm_label.c
---

5bc116926efa020b61dcf8663ffd784283a976b3
diff --cc src/lib/elm_index.c
index 64c6ba6,7c142ac..abe4bdb
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@@ -1221,5 -982,4 +986,3 @@@ elm_index_horizontal_get(const Evas_Obj
     if (!wd) return EINA_FALSE;
     return wd->horizontal;
  }
- 
--