Fix flora license version

Change-Id: If629fce2f68aa64892c021bce001971927db1133
Signed-off-by: Gongwook Lee <gongwook78.lee@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..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
 

diff --git a/NOTICE b/NOTICE
index 3997999..b6ec43b 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
 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.
+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/FaceDetectionForm.h b/project/inc/FaceDetectionForm.h
index af6a62a..d23b687 100644 (file)
--- a/project/inc/FaceDetectionForm.h
+++ b/project/inc/FaceDetectionForm.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/FaceRecognizer.h b/project/inc/FaceRecognizer.h
index b675771..c0a7a7f 100644 (file)
--- a/project/inc/FaceRecognizer.h
+++ b/project/inc/FaceRecognizer.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/Info.h b/project/inc/Info.h
index c76985c..ead0246 100644 (file)
--- a/project/inc/Info.h
+++ b/project/inc/Info.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/InfoCompare.h b/project/inc/InfoCompare.h
index 6e2ae90..be36dd6 100644 (file)
--- a/project/inc/InfoCompare.h
+++ b/project/inc/InfoCompare.h
@@ -2,7 +2,7 @@
 // Tizen C++ SDK\r
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.\r
 //\r
-// Licensed under the Flora License, Version 1.0 (the License);\r
+// Licensed under the Flora License, Version 1.1 (the License);\r
 // you may not use this file except in compliance with the License.\r
 // You may obtain a copy of the License at\r
 //\r

diff --git a/project/src/FaceDetectionForm.cpp b/project/src/FaceDetectionForm.cpp
index 01db79a..fc70a07 100644 (file)
--- a/project/src/FaceDetectionForm.cpp
+++ b/project/src/FaceDetectionForm.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/FaceRecognizer.cpp b/project/src/FaceRecognizer.cpp
index 2d59bbe..5e8dd79 100644 (file)
--- a/project/src/FaceRecognizer.cpp
+++ b/project/src/FaceRecognizer.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/FaceRecognizerEntry.cpp b/project/src/FaceRecognizerEntry.cpp
index 6e2f04e..128be47 100644 (file)
--- a/project/src/FaceRecognizerEntry.cpp
+++ b/project/src/FaceRecognizerEntry.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/Info.cpp b/project/src/Info.cpp
index bbc19b2..cc91325 100644 (file)
--- a/project/src/Info.cpp
+++ b/project/src/Info.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK
 // Copyright (c) 2012-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/InfoCompare.cpp b/project/src/InfoCompare.cpp
index 1786560..dd4fbe3 100644 (file)
--- a/project/src/InfoCompare.cpp
+++ b/project/src/InfoCompare.cpp
@@ -2,7 +2,7 @@
 // Tizen C++ SDK\r
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.\r
 //\r
-// Licensed under the Flora License, Version 1.0 (the License);\r
+// Licensed under the Flora License, Version 1.1 (the License);\r
 // you may not use this file except in compliance with the License.\r
 // You may obtain a copy of the License at\r
 //\r