From c5853918f3c8777cbefd0f8efb2f37216b656d24 Mon Sep 17 00:00:00 2001 From: JongSeok Lee Date: Mon, 13 May 2013 02:48:53 -0700 Subject: [PATCH] License version updated --- LICENSE.Flora | 26 +++++++++++++------------- include/cst-answering.h | 2 +- include/cst-barring-ime.h | 2 +- include/cst-barring.h | 2 +- include/cst-call-setting.h | 2 +- include/cst-common-string.h | 2 +- include/cst-common.h | 2 +- include/cst-debug.h | 2 +- include/cst-delete-list.h | 2 +- include/cst-forwarding-ime.h | 2 +- include/cst-forwarding.h | 2 +- include/cst-more-call-setting.h | 2 +- include/cst-prefix-dial-ime.h | 2 +- include/cst-prefix-dial.h | 2 +- include/cst-reject-msg-ime.h | 2 +- include/cst-reject-msg.h | 2 +- include/cst-status-tone.h | 2 +- include/cst-tapi-request.h | 2 +- include/cst-util.h | 2 +- include/cst-waiting.h | 2 +- include/cst-widget.h | 2 +- resource/call-setting.edc | 2 +- resource/ug_effect.edc | 2 +- src/cst-answering.c | 2 +- src/cst-barring-ime.c | 2 +- src/cst-barring.c | 2 +- src/cst-call-setting.c | 2 +- src/cst-common-string.c | 2 +- src/cst-delete-list.c | 2 +- src/cst-forwarding-ime.c | 2 +- src/cst-forwarding.c | 2 +- src/cst-main.c | 2 +- src/cst-more-call-setting.c | 2 +- src/cst-prefix-dial-ime.c | 2 +- src/cst-prefix-dial.c | 2 +- src/cst-reject-msg-ime.c | 2 +- src/cst-reject-msg.c | 2 +- src/cst-status-tone.c | 2 +- src/cst-tapi-request.c | 2 +- src/cst-util.c | 2 +- src/cst-waiting.c | 2 +- src/cst-widget.c | 2 +- theme/call-setting-theme.edc | 2 +- 43 files changed, 55 insertions(+), 55 deletions(-) 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/include/cst-answering.h b/include/cst-answering.h index e97dcca..faba4da 100755 --- a/include/cst-answering.h +++ b/include/cst-answering.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/cst-barring-ime.h b/include/cst-barring-ime.h index e727112..f584aa8 100755 --- a/include/cst-barring-ime.h +++ b/include/cst-barring-ime.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/cst-barring.h b/include/cst-barring.h index 29f7513..db56d4c 100755 --- a/include/cst-barring.h +++ b/include/cst-barring.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/cst-call-setting.h b/include/cst-call-setting.h index c3a59b7..26c0303 100755 --- a/include/cst-call-setting.h +++ b/include/cst-call-setting.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/cst-common-string.h b/include/cst-common-string.h index 0dca7f6..982248d 100755 --- a/include/cst-common-string.h +++ b/include/cst-common-string.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/cst-common.h b/include/cst-common.h index 5d42648..a495beb 100755 --- a/include/cst-common.h +++ b/include/cst-common.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/cst-debug.h b/include/cst-debug.h index 42b33fb..5cefe1d 100755 --- a/include/cst-debug.h +++ b/include/cst-debug.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/cst-delete-list.h b/include/cst-delete-list.h index 2566b31..a67709b 100755 --- a/include/cst-delete-list.h +++ b/include/cst-delete-list.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/cst-forwarding-ime.h b/include/cst-forwarding-ime.h index 4ea4763..e657ae1 100755 --- a/include/cst-forwarding-ime.h +++ b/include/cst-forwarding-ime.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/cst-forwarding.h b/include/cst-forwarding.h index e98553e..aa244b0 100755 --- a/include/cst-forwarding.h +++ b/include/cst-forwarding.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/cst-more-call-setting.h b/include/cst-more-call-setting.h index 02e97fd..90b3d40 100755 --- a/include/cst-more-call-setting.h +++ b/include/cst-more-call-setting.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/cst-prefix-dial-ime.h b/include/cst-prefix-dial-ime.h index ac3c51e..9a5be6e 100755 --- a/include/cst-prefix-dial-ime.h +++ b/include/cst-prefix-dial-ime.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/cst-prefix-dial.h b/include/cst-prefix-dial.h index 1a77a2b..36a771a 100755 --- a/include/cst-prefix-dial.h +++ b/include/cst-prefix-dial.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/cst-reject-msg-ime.h b/include/cst-reject-msg-ime.h index 96f76d7..ca4c4e8 100755 --- a/include/cst-reject-msg-ime.h +++ b/include/cst-reject-msg-ime.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/cst-reject-msg.h b/include/cst-reject-msg.h index 290deff..96529ec 100755 --- a/include/cst-reject-msg.h +++ b/include/cst-reject-msg.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/cst-status-tone.h b/include/cst-status-tone.h index 5910947..dba8a42 100755 --- a/include/cst-status-tone.h +++ b/include/cst-status-tone.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/cst-tapi-request.h b/include/cst-tapi-request.h index 31ae528..6296d0b 100755 --- a/include/cst-tapi-request.h +++ b/include/cst-tapi-request.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/cst-util.h b/include/cst-util.h index 4950e87..9e95e8c 100755 --- a/include/cst-util.h +++ b/include/cst-util.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/cst-waiting.h b/include/cst-waiting.h index e246d54..c44abed 100755 --- a/include/cst-waiting.h +++ b/include/cst-waiting.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/cst-widget.h b/include/cst-widget.h index d5e7cd0..be7be37 100755 --- a/include/cst-widget.h +++ b/include/cst-widget.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/resource/call-setting.edc b/resource/call-setting.edc index 32b5bc4..f41c2e9 100755 --- a/resource/call-setting.edc +++ b/resource/call-setting.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/resource/ug_effect.edc b/resource/ug_effect.edc index c4129eb..08b84b8 100755 --- a/resource/ug_effect.edc +++ b/resource/ug_effect.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/cst-answering.c b/src/cst-answering.c index b26bfd7..b980dbb 100755 --- a/src/cst-answering.c +++ b/src/cst-answering.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/cst-barring-ime.c b/src/cst-barring-ime.c index 63b403b..3188bfd 100755 --- a/src/cst-barring-ime.c +++ b/src/cst-barring-ime.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/cst-barring.c b/src/cst-barring.c index eca3c97..cb11614 100755 --- a/src/cst-barring.c +++ b/src/cst-barring.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/cst-call-setting.c b/src/cst-call-setting.c index 8ed2bd1..cd15652 100755 --- a/src/cst-call-setting.c +++ b/src/cst-call-setting.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/cst-common-string.c b/src/cst-common-string.c index bd8a6d8..34621b0 100755 --- a/src/cst-common-string.c +++ b/src/cst-common-string.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/cst-delete-list.c b/src/cst-delete-list.c index af92342..b3d9ebf 100755 --- a/src/cst-delete-list.c +++ b/src/cst-delete-list.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/cst-forwarding-ime.c b/src/cst-forwarding-ime.c index 5495160..d0ba178 100755 --- a/src/cst-forwarding-ime.c +++ b/src/cst-forwarding-ime.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/cst-forwarding.c b/src/cst-forwarding.c index b4a6cad..4858881 100755 --- a/src/cst-forwarding.c +++ b/src/cst-forwarding.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/cst-main.c b/src/cst-main.c index ea0c220..7423dae 100755 --- a/src/cst-main.c +++ b/src/cst-main.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/cst-more-call-setting.c b/src/cst-more-call-setting.c index cfb69a1..4b30fdf 100755 --- a/src/cst-more-call-setting.c +++ b/src/cst-more-call-setting.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/cst-prefix-dial-ime.c b/src/cst-prefix-dial-ime.c index cec800d..658af9c 100755 --- a/src/cst-prefix-dial-ime.c +++ b/src/cst-prefix-dial-ime.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/cst-prefix-dial.c b/src/cst-prefix-dial.c index 18b1b5f..8a91390 100755 --- a/src/cst-prefix-dial.c +++ b/src/cst-prefix-dial.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/cst-reject-msg-ime.c b/src/cst-reject-msg-ime.c index 66ffee7..becebbe 100755 --- a/src/cst-reject-msg-ime.c +++ b/src/cst-reject-msg-ime.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/cst-reject-msg.c b/src/cst-reject-msg.c index 18967eb..563db9b 100755 --- a/src/cst-reject-msg.c +++ b/src/cst-reject-msg.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/cst-status-tone.c b/src/cst-status-tone.c index 962899d..91b226b 100755 --- a/src/cst-status-tone.c +++ b/src/cst-status-tone.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/cst-tapi-request.c b/src/cst-tapi-request.c index b502411..6bd7728 100755 --- a/src/cst-tapi-request.c +++ b/src/cst-tapi-request.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/cst-util.c b/src/cst-util.c index ee021d1..043511e 100755 --- a/src/cst-util.c +++ b/src/cst-util.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/cst-waiting.c b/src/cst-waiting.c index 95a2a08..44290ba 100755 --- a/src/cst-waiting.c +++ b/src/cst-waiting.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/cst-widget.c b/src/cst-widget.c index 268d01c..8e38968 100755 --- a/src/cst-widget.c +++ b/src/cst-widget.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/theme/call-setting-theme.edc b/theme/call-setting-theme.edc index 42f8027..ecbf683 100755 --- a/theme/call-setting-theme.edc +++ b/theme/call-setting-theme.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 * -- 2.7.4