From a1d619f7a9d62faa7e96dc037978b3a61167b8b0 Mon Sep 17 00:00:00 2001 From: Byungsoo Kim Date: Mon, 29 Apr 2013 12:54:19 +0900 Subject: [PATCH] Update Flora licens version Change-Id: Id922025fa22e68bbbdaa6c404f25e698ab04fc5c Signed-off-by: Byungsoo Kim --- LICENSE.Flora | 28 ++++++++++++++-------------- NOTICE | 4 ++-- include/animation.h | 2 +- include/boot-animation.h | 2 +- src/animation.c | 2 +- src/boot-animation.c | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index 9a322d4..4a0af40 100755 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,8 +1,8 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 -http://floralicense.org/license +http://floralicense.org/license/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -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 4357fb7..57e504c 100755 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ 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. +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/animation.h b/include/animation.h index 8c1ca0b..4e06182 100755 --- a/include/animation.h +++ b/include/animation.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/boot-animation.h b/include/boot-animation.h index b4b23fb..862f397 100755 --- a/include/boot-animation.h +++ b/include/boot-animation.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/animation.c b/src/animation.c index af0f229..f244155 100755 --- a/src/animation.c +++ b/src/animation.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/boot-animation.c b/src/boot-animation.c index be6eb5b..4817024 100755 --- a/src/boot-animation.c +++ b/src/boot-animation.c @@ -1,7 +1,7 @@ /* * Copyright 2012 - 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 * -- 2.7.4