update license files and bolier plate about Flora license

Change-Id: I6549801b502e01f9b6d9c1885bcbffb3b2324175

14 files changed, 29 insertions, 28 deletions

diff --git a/LICENSE.Flora b/LICENSE.Flora
index 7923a74..571fe79 100755
--- 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
 
@@ -203,3 +203,4 @@ identification within third-party archives.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
diff --git a/NOTICE b/NOTICE
index 5fa11d2..94d56df 100755
--- 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 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/include/langs.h b/include/langs.h
index 3676954..e0a94a2 100755
--- a/include/langs.h
+++ b/include/langs.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/include/pwlock.h b/include/pwlock.h
index 5af79c0..19ea3af 100755
--- a/include/pwlock.h
+++ b/include/pwlock.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/include/tapi.h b/include/tapi.h
index cecc1c8..ca76a2d 100755
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/include/ui-callback.h b/include/ui-callback.h
index 61100ef..570938c 100755
--- a/include/ui-callback.h
+++ b/include/ui-callback.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/include/ui.h b/include/ui.h
index 3d9c7f6..1e00f58 100755
--- a/include/ui.h
+++ b/include/ui.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/include/util.h b/include/util.h
index b788233..11d2b67 100755
--- a/include/util.h
+++ b/include/util.h
@@ -3,7 +3,7 @@
  *
  * Copyright 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/src/langs.c b/src/langs.c
index 348c32b..d8ece4c 100755
--- a/src/langs.c
+++ b/src/langs.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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
  *
@@ -160,4 +160,4 @@ const char *pwlock_get_lang_title(void)
 		}
 	}    
 	return title;
-}
\ No newline at end of file
+}
diff --git a/src/pwlock.c b/src/pwlock.c
index 2a50025..7a72a5e 100755
--- a/src/pwlock.c
+++ b/src/pwlock.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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/src/tapi.c b/src/tapi.c
index ca98701..4d5fb80 100755
--- a/src/tapi.c
+++ b/src/tapi.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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/src/ui-callback.c b/src/ui-callback.c
index d9cb517..bd53fb3 100755
--- a/src/ui-callback.c
+++ b/src/ui-callback.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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/src/ui.c b/src/ui.c
index 60f7507..b46550f 100755
--- a/src/ui.c
+++ b/src/ui.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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/src/util.c b/src/util.c
index 6f2f9c6..1c374d9 100755
--- a/src/util.c
+++ b/src/util.c
@@ -3,7 +3,7 @@
  *
  * Copyright 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
  *