update license

Change-Id: Iab395e9aaca1ada4ce2624e90a18fc28da0fc6a4

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..571fe79 100755 (executable)
--- 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 2f9d481..94d56df 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora.
-Please, see the LICENSE.Flora file for Flora 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/include/sg-debug.h b/include/sg-debug.h
index bf6e80f..5041a4f 100755 (executable)
--- a/include/sg-debug.h
+++ b/include/sg-debug.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  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/include/sg-keys.h b/include/sg-keys.h
index def8b81..d6a5f62 100755 (executable)
--- a/include/sg-keys.h
+++ b/include/sg-keys.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  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/include/ug-setting-gallery.h b/include/ug-setting-gallery.h
index ddc3437..db0c401 100755 (executable)
--- a/include/ug-setting-gallery.h
+++ b/include/ug-setting-gallery.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  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/src/sg-keys.c b/src/sg-keys.c
index c7d6a18..0f23c9b 100755 (executable)
--- a/src/sg-keys.c
+++ b/src/sg-keys.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  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/src/ug-setting-gallery.c b/src/ug-setting-gallery.c
index cb77051..67930ce 100755 (executable)
--- a/src/ug-setting-gallery.c
+++ b/src/ug-setting-gallery.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  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