From 031fccc3cf873b33dd64355186043ed7ce8eb9b9 Mon Sep 17 00:00:00 2001 From: jihye Date: Mon, 29 Apr 2013 15:11:04 +0900 Subject: [PATCH] update flora license (1.0 -> 1.1) Change-Id: I66e149bc8cfcbee5e27d3cd00e7c8193f5018066 --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 4 ++-- include/devman_define_node_path.h | 2 +- src/device_manager_io.c | 2 +- src/device_manager_plugin_maru.c | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100644 --- 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 2800840..ffd3802 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ Copyright (c) 2000 - 2013 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 Version 1, 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/devman_define_node_path.h b/include/devman_define_node_path.h index 57142d9..7cbd34c 100644 --- a/include/devman_define_node_path.h +++ b/include/devman_define_node_path.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/device_manager_io.c b/src/device_manager_io.c index 9c619ef..f7085be 100644 --- a/src/device_manager_io.c +++ b/src/device_manager_io.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/device_manager_plugin_maru.c b/src/device_manager_plugin_maru.c index a5f8d74..b5ec240 100644 --- a/src/device_manager_plugin_maru.c +++ b/src/device_manager_plugin_maru.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 * -- 2.7.4