Update Flora license version

Change-Id: I3faea24525fea74912dc749e7e08616453ce22c2
Signed-off-by: Woowon <woowon.park@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 cca4178..827f23d 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -3,7 +3,7 @@ Except as noted, this software is licensed under Apache License, Version 2.
 Please, see the LICENSE file for Apache License terms and conditions.
 
 Several source codes may have its original copyright owner and/or
-be licensed under other than Apache License, Version 2, say, Flora License, Version 1.
+be licensed under other than Apache License, Version 2, say, Flora License, Version 1.1
 Please, see copyright and license comments section in the header of each file,
 and the LICENSE.Flora for Flora License terms and conditions.
 

diff --git a/inc/FNetNfcNdefPushManager.h b/inc/FNetNfcNdefPushManager.h
index c36620e..bac5380 100755 (executable)
--- a/inc/FNetNfcNdefPushManager.h
+++ b/inc/FNetNfcNdefPushManager.h
@@ -2,7 +2,7 @@
 // Open Service Platform
 // 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/src/FNetNfcNdefPushManager.cpp b/src/FNetNfcNdefPushManager.cpp
index 8ebcdd3..cf95fbb 100644 (file)
--- a/src/FNetNfcNdefPushManager.cpp
+++ b/src/FNetNfcNdefPushManager.cpp
@@ -2,7 +2,7 @@
 // Open Service Platform
 // 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/src/FNetNfc_NdefPushManagerImpl.cpp b/src/FNetNfc_NdefPushManagerImpl.cpp
index 3bd7129..5fee230 100644 (file)
--- a/src/FNetNfc_NdefPushManagerImpl.cpp
+++ b/src/FNetNfc_NdefPushManagerImpl.cpp
@@ -2,7 +2,7 @@
 // Open Service Platform
 // 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/src/inc/FNetNfc_NdefPushManagerImpl.h b/src/inc/FNetNfc_NdefPushManagerImpl.h
index ca33913..78aae44 100644 (file)
--- a/src/inc/FNetNfc_NdefPushManagerImpl.h
+++ b/src/inc/FNetNfc_NdefPushManagerImpl.h
@@ -2,7 +2,7 @@
 // Open Service Platform
 // 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
 //