From 59f7fc9aec9c095dada1a873128beedcb32a44e9 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Mon, 29 Apr 2013 16:39:08 +0900 Subject: [PATCH] [DictionaryDataControl] Change Flora license version Change-Id: Ibbceae10502bb97862554d0338bcb988eaa02ce9 Signed-off-by: Seokpil Park --- LICENSE.Flora | 26 ++++++++++++------------- NOTICE | 7 +++---- project/inc/DictionaryDataControl.h | 2 +- project/inc/DictionaryDataControlData.h | 2 +- project/inc/DictionaryDataControlFrame.h | 2 +- project/inc/FormFactory.h | 2 +- project/inc/MapDataControlForm.h | 2 +- project/inc/SelectDictionaryDataControlForm.h | 2 +- project/inc/SqlDataControlForm.h | 2 +- project/inc/ViewDescriptForm.h | 2 +- project/src/DictionaryDataControl.cpp | 2 +- project/src/DictionaryDataControlData.cpp | 2 +- project/src/DictionaryDataControlEntry.cpp | 2 +- project/src/DictionaryDataControlFrame.cpp | 2 +- project/src/FormFactory.cpp | 2 +- project/src/MapDataControlForm.cpp | 2 +- project/src/SelectDictionaryDataControlForm.cpp | 2 +- project/src/SqlDataControlForm.cpp | 2 +- project/src/ViewDescriptForm.cpp | 2 +- 19 files changed, 33 insertions(+), 34 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/NOTICE b/NOTICE index f37f329..94d56df 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,3 @@ -Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE.Flora file for Flora License terms and conditions. - +Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under Flora License, Version 1.1 +Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/project/inc/DictionaryDataControl.h b/project/inc/DictionaryDataControl.h index 337f693..688bac4 100644 --- a/project/inc/DictionaryDataControl.h +++ b/project/inc/DictionaryDataControl.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/DictionaryDataControlData.h b/project/inc/DictionaryDataControlData.h index 0a9804d..6200f38 100644 --- a/project/inc/DictionaryDataControlData.h +++ b/project/inc/DictionaryDataControlData.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/DictionaryDataControlFrame.h b/project/inc/DictionaryDataControlFrame.h index 5b9208e..b92b87f 100644 --- a/project/inc/DictionaryDataControlFrame.h +++ b/project/inc/DictionaryDataControlFrame.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/FormFactory.h b/project/inc/FormFactory.h index 5495540..22f8b10 100644 --- a/project/inc/FormFactory.h +++ b/project/inc/FormFactory.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/MapDataControlForm.h b/project/inc/MapDataControlForm.h index 7bff715..268af85 100644 --- a/project/inc/MapDataControlForm.h +++ b/project/inc/MapDataControlForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/SelectDictionaryDataControlForm.h b/project/inc/SelectDictionaryDataControlForm.h index aa21f44..2171c14 100644 --- a/project/inc/SelectDictionaryDataControlForm.h +++ b/project/inc/SelectDictionaryDataControlForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/SqlDataControlForm.h b/project/inc/SqlDataControlForm.h index 58f7d4e..7d6c71f 100644 --- a/project/inc/SqlDataControlForm.h +++ b/project/inc/SqlDataControlForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/inc/ViewDescriptForm.h b/project/inc/ViewDescriptForm.h index 87c36a6..ab89ad2 100644 --- a/project/inc/ViewDescriptForm.h +++ b/project/inc/ViewDescriptForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/DictionaryDataControl.cpp b/project/src/DictionaryDataControl.cpp index de71273..be64741 100644 --- a/project/src/DictionaryDataControl.cpp +++ b/project/src/DictionaryDataControl.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/DictionaryDataControlData.cpp b/project/src/DictionaryDataControlData.cpp index d7064cb..8bc8854 100644 --- a/project/src/DictionaryDataControlData.cpp +++ b/project/src/DictionaryDataControlData.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/DictionaryDataControlEntry.cpp b/project/src/DictionaryDataControlEntry.cpp index 548444b..52888c4 100644 --- a/project/src/DictionaryDataControlEntry.cpp +++ b/project/src/DictionaryDataControlEntry.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/DictionaryDataControlFrame.cpp b/project/src/DictionaryDataControlFrame.cpp index a384acc..fc63ab9 100644 --- a/project/src/DictionaryDataControlFrame.cpp +++ b/project/src/DictionaryDataControlFrame.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/FormFactory.cpp b/project/src/FormFactory.cpp index 5ac760f..84fb4bc 100644 --- a/project/src/FormFactory.cpp +++ b/project/src/FormFactory.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/MapDataControlForm.cpp b/project/src/MapDataControlForm.cpp index 4fa6e74..2dc6d69 100644 --- a/project/src/MapDataControlForm.cpp +++ b/project/src/MapDataControlForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/SelectDictionaryDataControlForm.cpp b/project/src/SelectDictionaryDataControlForm.cpp index 243b36c..270e320 100644 --- a/project/src/SelectDictionaryDataControlForm.cpp +++ b/project/src/SelectDictionaryDataControlForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/SqlDataControlForm.cpp b/project/src/SqlDataControlForm.cpp index 1487e34..fa09fee 100644 --- a/project/src/SqlDataControlForm.cpp +++ b/project/src/SqlDataControlForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // diff --git a/project/src/ViewDescriptForm.cpp b/project/src/ViewDescriptForm.cpp index dfda796..6f21cc0 100644 --- a/project/src/ViewDescriptForm.cpp +++ b/project/src/ViewDescriptForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -- 2.7.4