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/taskmgr.edc b/data/taskmgr.edc
index 3ebb752f6190e538cda26e3c96e3eda4bcd621ab..ec95eeaf148236c634d8c166bc018cb69d4545af 100755 (executable)
--- a/data/taskmgr.edc
+++ b/data/taskmgr.edc
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/data/themes/theme_taskmanager.edc b/data/themes/theme_taskmanager.edc
index 8c94060c951b696337c3e5593150e33da4c3563c..1bccef6f6d69e896c95e5f14b07d1ed395094c0e 100755 (executable)
--- a/data/themes/theme_taskmanager.edc
+++ b/data/themes/theme_taskmanager.edc
@@ -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/_cpu.c b/src/_cpu.c
index 8a7f1dfb85606356c253f2ddf40f691e12283403..0aaa89d7dc642d503b271a7d6076e4fccf3f0fd6 100755 (executable)
--- a/src/_cpu.c
+++ b/src/_cpu.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_cpu.h b/src/_cpu.h
index c3d97179d52b54832cd9a94ec9cfb76e11703329..2a95bf7f3df64b7120891e4935e44e86fde8197b 100755 (executable)
--- a/src/_cpu.h
+++ b/src/_cpu.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_eina.c b/src/_eina.c
index fa5031690c2c5d0b3ba5078baac32751aa013a9d..d15aa85858a475a97e293feb0ea542f62bbbe266 100755 (executable)
--- a/src/_eina.c
+++ b/src/_eina.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_eina.h b/src/_eina.h
index 59d2efe1f786f0a83b37f3580332fac526028d27..98bf76fb6b8edb66188737190d5b7d959fe90e8f 100755 (executable)
--- a/src/_eina.h
+++ b/src/_eina.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_genlist.c b/src/_genlist.c
index 520cf0d4d79332f401165597a597352c7751880e..a0012ee3453ff0ba605a939d01f89e37c059062e 100755 (executable)
--- a/src/_genlist.c
+++ b/src/_genlist.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_genlist.h b/src/_genlist.h
index 876f7417084e9a062457a665c7f6a41c5fe60db2..ee4751596ef50c59ebf8f0514b41b967a68a25f6 100755 (executable)
--- a/src/_genlist.h
+++ b/src/_genlist.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_info.c b/src/_info.c
index bb7419e8c00a8a2609b14f3f699a4e1e0d326c93..1940a7eba5cb8d2a14d6e583079146cb091a5480 100755 (executable)
--- a/src/_info.c
+++ b/src/_info.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_info.h b/src/_info.h
index 46b206f6d9d373b2bf78f67297eab7704ea1c172..e555f82d47a0a62cd97c7ed21255485fd0dd4689 100755 (executable)
--- a/src/_info.h
+++ b/src/_info.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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 46a62b6345f6fec07dd9c6811f052b8e13620e2f..47f165f43fbc7b83c6958ed4b5eb5115f389e4ec 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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 c37c07598ced41e803aee59df993c77f5869c9d7..a99dfab3c2754da816d16f35ad50006b4c83cba1 100755 (executable)
--- a/src/_logic.h
+++ b/src/_logic.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_progressbar.c b/src/_progressbar.c
index abc615d212f94a1a7a1bc80421d94a43e2df3634..ac33092d8fbcb5a7b4af3f4ec9008188c4d2f3dc 100755 (executable)
--- a/src/_progressbar.c
+++ b/src/_progressbar.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/_progressbar.h b/src/_progressbar.h
index bdb28853213cfd7a60096b7e84b1a8be5a22f824..56b58915cc924fcf016912d0805741db66f07e7c 100755 (executable)
--- a/src/_progressbar.h
+++ b/src/_progressbar.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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 ccc9aa7e9d927e32288ed96b55ef51e66da2f421..06869316edad1163d8b6f9dc337f5a57d7b79678 100755 (executable)
--- a/src/_util_efl.c
+++ b/src/_util_efl.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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 b4b7fd02c915a1d7b2b7d043bf266cca1e945954..1c4100914a8a35dd2bafc8b3025e639e113d637a 100755 (executable)
--- a/src/_util_efl.h
+++ b/src/_util_efl.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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 a5aca2f26ac331a569a3d4a8ce5433d27dfb0e95..efd24e178496ea7b788d457669b14dffaecb6830 100755 (executable)
--- a/src/_util_log.h
+++ b/src/_util_log.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/taskmanager.c b/src/taskmanager.c
index cc32e30181d3b8941b2349f77c7ce4d35b6b2aa8..eea7997a183bfc155e40880dc1f41e2a232e9001 100755 (executable)
--- a/src/taskmanager.c
+++ b/src/taskmanager.c
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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/taskmanager.h b/src/taskmanager.h
index d85a2ad22ce954eb080159b1b1658f3f6b7efda2..21082bc63690e2486e1869869b6013bcbf6b36bd 100755 (executable)
--- a/src/taskmanager.h
+++ b/src/taskmanager.h
@@ -2,7 +2,7 @@
  * org.tizen.taskmgr
  * Copyright (c) 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
  *