[LocalContent] Change flora license statement

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

diff --git a/LICENSE.Flora b/LICENSE.Flora
old mode 100755 (executable)
new mode 100644 (file)
index fd90a36..571fe79
--- 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 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/AppResourceId.h b/project/inc/AppResourceId.h
index 29d2258..7fccb0d 100644 (file)
--- a/project/inc/AppResourceId.h
+++ b/project/inc/AppResourceId.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/ContentSearchSampleImpl.h b/project/inc/ContentSearchSampleImpl.h
index fbbd439..a22873d 100644 (file)
--- a/project/inc/ContentSearchSampleImpl.h
+++ b/project/inc/ContentSearchSampleImpl.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/DetailForm.h b/project/inc/DetailForm.h
index 742bc03..57db34e 100644 (file)
--- a/project/inc/DetailForm.h
+++ b/project/inc/DetailForm.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/LocalContent.h b/project/inc/LocalContent.h
index 855db9d..efe3de7 100644 (file)
--- a/project/inc/LocalContent.h
+++ b/project/inc/LocalContent.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/LocalContentFormFactory.h b/project/inc/LocalContentFormFactory.h
index f5b8a9e..8dac086 100644 (file)
--- a/project/inc/LocalContentFormFactory.h
+++ b/project/inc/LocalContentFormFactory.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/LocalContentFrame.h b/project/inc/LocalContentFrame.h
index 0ecb6c9..545f812 100644 (file)
--- a/project/inc/LocalContentFrame.h
+++ b/project/inc/LocalContentFrame.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/LocalContentPanelFactory.h b/project/inc/LocalContentPanelFactory.h
index 3513885..16ef18f 100644 (file)
--- a/project/inc/LocalContentPanelFactory.h
+++ b/project/inc/LocalContentPanelFactory.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/MainForm.h b/project/inc/MainForm.h
index b67b079..19be01c 100644 (file)
--- a/project/inc/MainForm.h
+++ b/project/inc/MainForm.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/SearchResultForm.h b/project/inc/SearchResultForm.h
index c79e09e..990b1a0 100644 (file)
--- a/project/inc/SearchResultForm.h
+++ b/project/inc/SearchResultForm.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/AppResourceId.cpp b/project/src/AppResourceId.cpp
index d3b1f3e..f622f04 100644 (file)
--- a/project/src/AppResourceId.cpp
+++ b/project/src/AppResourceId.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/ContentSearchSampleImpl.cpp b/project/src/ContentSearchSampleImpl.cpp
index 5b9de9a..463d5d7 100644 (file)
--- a/project/src/ContentSearchSampleImpl.cpp
+++ b/project/src/ContentSearchSampleImpl.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/DetailForm.cpp b/project/src/DetailForm.cpp
index ad191cf..cc05971 100644 (file)
--- a/project/src/DetailForm.cpp
+++ b/project/src/DetailForm.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/LocalContent.cpp b/project/src/LocalContent.cpp
index 30fa501..eb5de46 100644 (file)
--- a/project/src/LocalContent.cpp
+++ b/project/src/LocalContent.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/LocalContentEntry.cpp b/project/src/LocalContentEntry.cpp
index 0ccce25..8065158 100644 (file)
--- a/project/src/LocalContentEntry.cpp
+++ b/project/src/LocalContentEntry.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/LocalContentFormFactory.cpp b/project/src/LocalContentFormFactory.cpp
index 3619a91..2da3b88 100644 (file)
--- a/project/src/LocalContentFormFactory.cpp
+++ b/project/src/LocalContentFormFactory.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/LocalContentFrame.cpp b/project/src/LocalContentFrame.cpp
index 0502e94..6f00b6e 100644 (file)
--- a/project/src/LocalContentFrame.cpp
+++ b/project/src/LocalContentFrame.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/LocalContentPanelFactory.cpp b/project/src/LocalContentPanelFactory.cpp
index 3d30242..3e52a9f 100644 (file)
--- a/project/src/LocalContentPanelFactory.cpp
+++ b/project/src/LocalContentPanelFactory.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/MainForm.cpp b/project/src/MainForm.cpp
index cd0304d..7c6ddb8 100644 (file)
--- a/project/src/MainForm.cpp
+++ b/project/src/MainForm.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/SearchResultForm.cpp b/project/src/SearchResultForm.cpp
index ca0e0ed..9e075e2 100644 (file)
--- a/project/src/SearchResultForm.cpp
+++ b/project/src/SearchResultForm.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
 //