[SLP master Merge] 2011/07/19 10:40

diff --cc themes/groups/editfield.edc
Simple merge

diff --cc themes/groups/entry.edc
index 7903d11,55c4f2a..bb3244f
--- 1/themes/groups/entry.edc
--- 2/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@@ -1,5 -1,27 +1,28 @@@
+ /*
+  *  nbeat-theme
+  *
+  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+  *
+  * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, IlKook Yun <ilkook.yun@samsung.com>, CinWoo Kim <cinoo.kim@samsung.com> JiYeon Park <jy0703.park@samsung.com>
+  * 
+  * This library is free software; you can redistribute it and/or modify it under
+  * the terms of the GNU Lesser General Public License as published by the
+  * Free Software Foundation; either version 2.1 of the License, or (at your option)
+  * any later version.
+  * 
+  * This library is distributed in the hope that it will be useful, but WITHOUT ANY
+  * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+  * License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public License
+  * along with this library; if not, write to the Free Software Foundation, Inc., 51
+  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  *
+  */
+ 
     group { name: "elm/entry/base/default";
 +      alias: "elm/entry/base-mixedwrap/default";
        data.item: "default_font_size" "24";
        data.item: "min_font_size" "8";
        data.item: "max_font_size" "60";

diff --cc themes/groups/label.edc
Simple merge