merge with master

[apps/core/preloaded/calendar.git] / data / edc / theme3 / originals / genlist_textblock_style.edc

diff --git a/data/edc/theme3/originals/genlist_textblock_style.edc b/data/edc/theme3/originals/genlist_textblock_style.edc
index 9aae8ca..6c5807f 100644 (file)
--- a/data/edc/theme3/originals/genlist_textblock_style.edc
+++ b/data/edc/theme3/originals/genlist_textblock_style.edc
@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * This software is the confidential and proprietary information of SAMSUNG
- * ELECTRONICS ("Confidential Information"). You agree and acknowledge that this
- * software is owned by Samsung and you shall not disclose such Confidential
- * Information and shall use it only in accordance with the terms of the license
- * agreement you entered into with SAMSUNG ELECTRONICS. SAMSUNG make no
- * representations or warranties about the suitability of the software, either
- * express or implied, including but not limited to the implied warranties of
- * merchantability, fitness for a particular purpose, or non-infringement.
- * SAMSUNG shall not be liable for any damages suffered by licensee arising out
- * of or releated to this software.
- *
- */
+  *
+  *  Copyright 2012  Samsung Electronics Co., Ltd
+  *
+  *  Licensed under the Flora License, Version 1.0 (the "License");
+  *  you may not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *      http://floralicense.org/license/
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS,
+  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  */
 
 /*
  * vim:ts=3