[AppWidgetViewer] Change Flora license version

Change-Id: I433510fdd2ad68612c5c1645ff4cfc61403ab760
Signed-off-by: Seokpil Park <seokpil.park@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
index 7923a74..571fe79 100644 (file)
--- 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
 
@@ -203,3 +203,4 @@ identification within third-party archives.
    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.
+

diff --git a/NOTICE b/NOTICE
index 3997999..94d56df 100644 (file)
--- 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 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/AppWidgetViewer.h b/project/inc/AppWidgetViewer.h
index 386524e..193d655 100644 (file)
--- a/project/inc/AppWidgetViewer.h
+++ b/project/inc/AppWidgetViewer.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerFormFactory.h b/project/inc/AppWidgetViewerFormFactory.h
index 50baec7..36299f0 100644 (file)
--- a/project/inc/AppWidgetViewerFormFactory.h
+++ b/project/inc/AppWidgetViewerFormFactory.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerFrame.h b/project/inc/AppWidgetViewerFrame.h
index 17a36d6..d1d12f0 100644 (file)
--- a/project/inc/AppWidgetViewerFrame.h
+++ b/project/inc/AppWidgetViewerFrame.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerMainForm.h b/project/inc/AppWidgetViewerMainForm.h
index 7e074bf..ea604ef 100644 (file)
--- a/project/inc/AppWidgetViewerMainForm.h
+++ b/project/inc/AppWidgetViewerMainForm.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerPanelFactory.h b/project/inc/AppWidgetViewerPanelFactory.h
index feac309..1e21fe5 100644 (file)
--- a/project/inc/AppWidgetViewerPanelFactory.h
+++ b/project/inc/AppWidgetViewerPanelFactory.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/ViewForm.h b/project/inc/ViewForm.h
index 85d5964..adfa56c 100644 (file)
--- a/project/inc/ViewForm.h
+++ b/project/inc/ViewForm.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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
 //
@@ -53,4 +53,4 @@ private:
        static const int ID_FOOTER_ITEM1 = 1001;
 }; // ViewForm
 
-#endif // _VIEW_FORM_H_
\ No newline at end of file
+#endif // _VIEW_FORM_H_

diff --git a/project/src/AppWidgetViewer.cpp b/project/src/AppWidgetViewer.cpp
index 78e9ac8..3a99cdb 100644 (file)
--- a/project/src/AppWidgetViewer.cpp
+++ b/project/src/AppWidgetViewer.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerEntry.cpp b/project/src/AppWidgetViewerEntry.cpp
index 287b191..3e6b2fd 100644 (file)
--- a/project/src/AppWidgetViewerEntry.cpp
+++ b/project/src/AppWidgetViewerEntry.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerFormFactory.cpp b/project/src/AppWidgetViewerFormFactory.cpp
index 0cbb6dc..58905ba 100644 (file)
--- a/project/src/AppWidgetViewerFormFactory.cpp
+++ b/project/src/AppWidgetViewerFormFactory.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerFrame.cpp b/project/src/AppWidgetViewerFrame.cpp
index ac29dd4..55338bc 100644 (file)
--- a/project/src/AppWidgetViewerFrame.cpp
+++ b/project/src/AppWidgetViewerFrame.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerMainForm.cpp b/project/src/AppWidgetViewerMainForm.cpp
index 2942dae..1133440 100644 (file)
--- a/project/src/AppWidgetViewerMainForm.cpp
+++ b/project/src/AppWidgetViewerMainForm.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/AppWidgetViewerPanelFactory.cpp b/project/src/AppWidgetViewerPanelFactory.cpp
index 65ae3c6..739910d 100644 (file)
--- a/project/src/AppWidgetViewerPanelFactory.cpp
+++ b/project/src/AppWidgetViewerPanelFactory.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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/ViewForm.cpp b/project/src/ViewForm.cpp
index 9069121..47450ed 100644 (file)
--- a/project/src/ViewForm.cpp
+++ b/project/src/ViewForm.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2013 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
 //