Update License

Change-Id: I6796fa12ca10bccdda478f7d7cf0788b9480405e

diff --git a/LICENSE b/LICENSE
index fd90a36..571fe79 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Flora License
 
 Flora License
 

-Version 1.0, April, 2013
+Version 1.1, April, 2013

 
 http://floralicense.org/license/
 
 
 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
      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
 
 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]
 
 
    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
 
    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/CModule.h b/include/CModule.h
index 9e737a3..f7c66ac 100644 (file)
--- a/include/CModule.h
+++ b/include/CModule.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/c-abi.h b/include/c-abi.h
index a43c4d0..d0a0666 100644 (file)
--- a/include/c-abi.h
+++ b/include/c-abi.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/debug.h b/include/debug.h
index ae273b7..5904b4c 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/dlist.h b/include/dlist.h
index 9f34dab..6ce75e0 100644 (file)
--- a/include/dlist.h
+++ b/include/dlist.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/livebox-cpp.h b/include/livebox-cpp.h
index 6b39e56..37a8f51 100644 (file)
--- a/include/livebox-cpp.h
+++ b/include/livebox-cpp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/livebox-impl.h b/include/livebox-impl.h
index f9a644b..82a28f6 100644 (file)
--- a/include/livebox-impl.h
+++ b/include/livebox-impl.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/CModule.cpp b/src/CModule.cpp
index 5e9eb98..e06f365 100644 (file)
--- a/src/CModule.cpp
+++ b/src/CModule.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/dlist.cpp b/src/dlist.cpp
index b8e87ef..980f59a 100644 (file)
--- a/src/dlist.cpp
+++ b/src/dlist.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * 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/livebox.cpp b/src/livebox.cpp
index 8d87ce2..75f1b1a 100644 (file)
--- a/src/livebox.cpp
+++ b/src/livebox.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
 /*
  * Copyright 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
  *
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *