Updated the license and boilerplate

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36f1d61ce22c607611e4684c41a74226992..571fe7991f5777337d80bf49508e8d7e2f4d136b 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 22952932f3a38fcb2988168c81e5677fc5c458a7..94d56df26bd88f9b93fca35b03ccb87152e1ff18 100755 (executable)
--- 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
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+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/minicontrol-error.h b/include/minicontrol-error.h
index 3b16ff9b61eccd8ae525f960c34034fc4cb607d1..0f558620e57004f7e63fef4404fa11b46b4f76e1 100755 (executable)
--- a/include/minicontrol-error.h
+++ b/include/minicontrol-error.h
@@ -1,7 +1,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/minicontrol-internal.h b/include/minicontrol-internal.h
index 61b22f51878dbef0c293b7835b867726de3c175a..f67fd5344087aabaa4260d7670b66227d43f4ebd 100755 (executable)
--- a/include/minicontrol-internal.h
+++ b/include/minicontrol-internal.h
@@ -1,7 +1,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/minicontrol-log.h b/include/minicontrol-log.h
index 899c3739968cea3bba96e40e8cfe6972a96f4a28..88bf64f3fe2a4ea573bc705b4e1b22f3efa49d83 100755 (executable)
--- a/include/minicontrol-log.h
+++ b/include/minicontrol-log.h
@@ -1,7 +1,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/minicontrol-monitor.h b/include/minicontrol-monitor.h
index 74d19eeada25fa22743341f8b3a12dbbe8827ddb..57bc0a54fc0a88872c83e2baeb8a53424e464d0f 100755 (executable)
--- a/include/minicontrol-monitor.h
+++ b/include/minicontrol-monitor.h
@@ -1,7 +1,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/minicontrol-provider.h b/include/minicontrol-provider.h
index 2aa8865f617699c83fe0639c59ed4cc31daba864..db26613209661b6be8c02da3da5923448d4f012a 100755 (executable)
--- a/include/minicontrol-provider.h
+++ b/include/minicontrol-provider.h
@@ -1,7 +1,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/minicontrol-type.h b/include/minicontrol-type.h
index 3aa47b432eb57e6a7a7798c9b5ae6c0d700e09cb..8a793371282dfd2d3421b0bdc41d7c8668c990f1 100755 (executable)
--- a/include/minicontrol-type.h
+++ b/include/minicontrol-type.h
@@ -1,7 +1,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/minicontrol-viewer.h b/include/minicontrol-viewer.h
index 2898b038ee907cd0719b8d472715306434df5cd1..36bcc75efd11106ec57c9087c2d8d6fb3c2731a0 100755 (executable)
--- a/include/minicontrol-viewer.h
+++ b/include/minicontrol-viewer.h
@@ -1,7 +1,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/minicontrol.h b/include/minicontrol.h
index 0308aa4b6baf3dcef011bd8aaf2d45629cc9f604..2873ff937f145820cc8bba2650f3d2503726891e 100755 (executable)
--- a/include/minicontrol.h
+++ b/include/minicontrol.h
@@ -1,7 +1,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/minicontrol-internal.c b/src/minicontrol-internal.c
index 9dde33ac81b21060f8695ed3b00abc85072d8764..b62be1ec56d6b8916a5bf76001798770ae7d6460 100755 (executable)
--- a/src/minicontrol-internal.c
+++ b/src/minicontrol-internal.c
@@ -1,7 +1,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/minicontrol-monitor.c b/src/minicontrol-monitor.c
index d6520e7d74521d1c8bf256b3be05f63a519850c9..1f0024de38aa28a1b9faae1e1a068d38af0884de 100755 (executable)
--- a/src/minicontrol-monitor.c
+++ b/src/minicontrol-monitor.c
@@ -1,7 +1,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/minicontrol-provider.c b/src/minicontrol-provider.c
index 662a310f55e78bbd00007364c49eb8b4be7f88d5..9f8178bb7191e49472576af5899ad205118a4360 100755 (executable)
--- a/src/minicontrol-provider.c
+++ b/src/minicontrol-provider.c
@@ -1,7 +1,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/minicontrol-viewer.c b/src/minicontrol-viewer.c
index 6a346ebc76a8adefe4af5cf21c72035e55e6f01b..87e4dd81687d5b9b8fefd9f7881d4bc963d4a74e 100755 (executable)
--- a/src/minicontrol-viewer.c
+++ b/src/minicontrol-viewer.c
@@ -1,7 +1,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
  *