From: youngsub ko Date: Thu, 2 May 2013 08:42:48 +0000 (+0900) Subject: Updated the license and boilerplate X-Git-Tag: 2.2.1_release X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2F2.2.1_release;p=apps%2Fhome%2Fminicontrol.git Updated the license and boilerplate --- diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100755 --- 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 2295293..94d56df 100755 --- a/NOTICE +++ b/NOTICE @@ -1,3 +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.flora 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.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/include/minicontrol-error.h b/include/minicontrol-error.h index 3b16ff9..0f55862 100755 --- a/include/minicontrol-error.h +++ b/include/minicontrol-error.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/minicontrol-internal.h b/include/minicontrol-internal.h index 61b22f5..f67fd53 100755 --- a/include/minicontrol-internal.h +++ b/include/minicontrol-internal.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/minicontrol-log.h b/include/minicontrol-log.h index 899c373..88bf64f 100755 --- a/include/minicontrol-log.h +++ b/include/minicontrol-log.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/minicontrol-monitor.h b/include/minicontrol-monitor.h index 74d19ee..57bc0a5 100755 --- a/include/minicontrol-monitor.h +++ b/include/minicontrol-monitor.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/minicontrol-provider.h b/include/minicontrol-provider.h index 2aa8865..db26613 100755 --- a/include/minicontrol-provider.h +++ b/include/minicontrol-provider.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/minicontrol-type.h b/include/minicontrol-type.h index 3aa47b4..8a79337 100755 --- a/include/minicontrol-type.h +++ b/include/minicontrol-type.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/minicontrol-viewer.h b/include/minicontrol-viewer.h index 2898b03..36bcc75 100755 --- a/include/minicontrol-viewer.h +++ b/include/minicontrol-viewer.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/minicontrol.h b/include/minicontrol.h index 0308aa4..2873ff9 100755 --- a/include/minicontrol.h +++ b/include/minicontrol.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/minicontrol-internal.c b/src/minicontrol-internal.c index 9dde33a..b62be1e 100755 --- a/src/minicontrol-internal.c +++ b/src/minicontrol-internal.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/minicontrol-monitor.c b/src/minicontrol-monitor.c index d6520e7..1f0024d 100755 --- a/src/minicontrol-monitor.c +++ b/src/minicontrol-monitor.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/minicontrol-provider.c b/src/minicontrol-provider.c index 662a310..9f8178b 100755 --- a/src/minicontrol-provider.c +++ b/src/minicontrol-provider.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/minicontrol-viewer.c b/src/minicontrol-viewer.c index 6a346eb..87e4dd8 100755 --- a/src/minicontrol-viewer.c +++ b/src/minicontrol-viewer.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 *