Update license version.

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 3997999d133e4ab883c6da32cc00582fb6c63389..db64ab0f8672bfece5d1160b9755742bb6db601d 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +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 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 file for Flora License, Version 1.1 terms and conditions.

diff --git a/data/volume_app.edc b/data/volume_app.edc
index 7ebacd19b666451633dce0d218da99acdecf6b7a..c4357c5902a704187dae975845275297c7accea3 100755 (executable)
--- a/data/volume_app.edc
+++ b/data/volume_app.edc
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/_logic.c b/src/_logic.c
index b157b94e6e14be63b3d3c3cf46f5be20e4f0e099..959531a02a9fe50bb6d2cbf669ef14cc5759094e 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/_logic.h b/src/_logic.h
index b55a64e10a5040fa0b6a82eaf69f1c9d5f15c6ab..eb51f7c589546977aa78a062d5492628ab55fc19 100755 (executable)
--- a/src/_logic.h
+++ b/src/_logic.h
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/_sound.c b/src/_sound.c
index a88e308abcc8cbd8d90d177768724869cbc8c18e..8bd8f58bd5ed434525a145783c9550c1548ca58e 100755 (executable)
--- a/src/_sound.c
+++ b/src/_sound.c
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/_sound.h b/src/_sound.h
index 9b79b2acd909e3790fe49862351de38d9a06131c..fb71df32c72038b458cdc3518c6e92d584e25491 100755 (executable)
--- a/src/_sound.h
+++ b/src/_sound.h
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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_efl.c b/src/_util_efl.c
index c32fc80a8d43c6a01d3eff550cddd9c52b266bc4..79289bbf10ba2dfc062ca9650fcde411908ee79c 100755 (executable)
--- a/src/_util_efl.c
+++ b/src/_util_efl.c
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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_efl.h b/src/_util_efl.h
index c58c2d6914ba5564e08686601660a6b56efe25d8..911c02c7a39c76ee3cc9034d4b1b1932b8e5dce7 100755 (executable)
--- a/src/_util_efl.h
+++ b/src/_util_efl.h
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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_log.h b/src/_util_log.h
index 7e43dd3818b3a9a745f93bb6d1558167b671412b..aa5154ba9d71601157727772bf5212acfcc3d68c 100755 (executable)
--- a/src/_util_log.h
+++ b/src/_util_log.h
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/volume.c b/src/volume.c
index 121089a93474aa74d9cc96610b50f798b166b909..497951256fbe7fa5e365b5e0f795415051ef6674 100755 (executable)
--- a/src/volume.c
+++ b/src/volume.c
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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/volume.h b/src/volume.h
index 12778e0700f09b1262571ae3f23d997bd2fabadf..4872a8f0501bba48ee526d1b896d54977b70ad5e 100755 (executable)
--- a/src/volume.h
+++ b/src/volume.h
@@ -2,7 +2,7 @@
  * org.tizen.volume
  * 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
  *