Update license file

Change-Id: Ic0422b9f286654090d9abeee5f515f8729869da2

19 files changed, 32 insertions, 32 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 9debbea..54afaa2 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +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.
+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/ug-nfc-setting-efl/include/ug-nfc-setting-db.h b/ug-nfc-setting-efl/include/ug-nfc-setting-db.h
index 76eb8f1..88937ed 100644
--- a/ug-nfc-setting-efl/include/ug-nfc-setting-db.h
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-db.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/include/ug-nfc-setting-main.h b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
index 14f8fda..a37b37e 100644
--- a/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-main.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/include/ug-nfc-setting-popup.h b/ug-nfc-setting-efl/include/ug-nfc-setting-popup.h
index e684795..45c30aa 100644
--- a/ug-nfc-setting-efl/include/ug-nfc-setting-popup.h
+++ b/ug-nfc-setting-efl/include/ug-nfc-setting-popup.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/src/ug-nfc-setting-db.c b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
index d16da8d..b18d1a1 100644
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-db.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/src/ug-nfc-setting-main.c b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
index 3b6fac2..22764bb 100644
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-main.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c b/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
index aa65b51..4777959 100644
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-popup.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
index 62e0ef6..0485941 100644
--- a/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
+++ b/ug-nfc-setting-efl/src/ug-nfc-setting-predefined-item.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h b/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
index f9a03e9..7740158 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-common-debug.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-common-error.h b/ug-nfc-share-efl/include/ug-nfc-share-common-error.h
index 32d2e40..457bb69 100755
--- a/ug-nfc-share-efl/include/ug-nfc-share-common-error.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-common-error.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-common-util.h b/ug-nfc-share-efl/include/ug-nfc-share-common-util.h
index 54f5186..4dbd6b2 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-common-util.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-common-util.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-main.h b/ug-nfc-share-efl/include/ug-nfc-share-main.h
index c85ae3a..c9e25b9 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-main.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-main.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-popup.h b/ug-nfc-share-efl/include/ug-nfc-share-popup.h
index ab7d5bf..f0ae30b 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-popup.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-popup.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/include/ug-nfc-share-tag.h b/ug-nfc-share-efl/include/ug-nfc-share-tag.h
index 3bd8b99..8a5685c 100644
--- a/ug-nfc-share-efl/include/ug-nfc-share-tag.h
+++ b/ug-nfc-share-efl/include/ug-nfc-share-tag.h
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/src/ug-nfc-share-common-util.c b/ug-nfc-share-efl/src/ug-nfc-share-common-util.c
index d5a1b25..03bf621 100644
--- a/ug-nfc-share-efl/src/ug-nfc-share-common-util.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-common-util.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/src/ug-nfc-share-main.c b/ug-nfc-share-efl/src/ug-nfc-share-main.c
index 7e20efc..698389f 100644
--- a/ug-nfc-share-efl/src/ug-nfc-share-main.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-main.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/src/ug-nfc-share-popup.c b/ug-nfc-share-efl/src/ug-nfc-share-popup.c
index 8ebf490..8ce79db 100644
--- a/ug-nfc-share-efl/src/ug-nfc-share-popup.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-popup.c
@@ -1,7 +1,7 @@
 /*
   * 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/ug-nfc-share-efl/src/ug-nfc-share-tag.c b/ug-nfc-share-efl/src/ug-nfc-share-tag.c
index 04ca22f..b76daa8 100644
--- a/ug-nfc-share-efl/src/ug-nfc-share-tag.c
+++ b/ug-nfc-share-efl/src/ug-nfc-share-tag.c
@@ -1,7 +1,7 @@
 /*
   * 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