From: eh1112.kim Date: Tue, 30 Apr 2013 01:35:51 +0000 (+0900) Subject: Update Flora license. X-Git-Tag: 2.2.1_release~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b28c9722327d0e47eee0eff645eef169e2415559;p=samples%2Fnative%2FPushClient.git Update Flora license. Change-Id: I1980acb8d7dcd63c1ad7d11f6d6e6b2d7e002178 Signed-off-by: eh1112.kim --- 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 4b8882d..b178b63 100755 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,3 @@ Copyright (c) 2012-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 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. \ No newline at end of file diff --git a/project/inc/FormFactory.h b/project/inc/FormFactory.h index 4732840..9cddeb0 100755 --- a/project/inc/FormFactory.h +++ b/project/inc/FormFactory.h @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/inc/MainForm.h b/project/inc/MainForm.h index ec84b6b..76aee9c 100755 --- a/project/inc/MainForm.h +++ b/project/inc/MainForm.h @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/inc/PushClient.h b/project/inc/PushClient.h index df4ff19..add4e66 100755 --- a/project/inc/PushClient.h +++ b/project/inc/PushClient.h @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/inc/SettingForm.h b/project/inc/SettingForm.h index 5a2c983..caa04bc 100755 --- a/project/inc/SettingForm.h +++ b/project/inc/SettingForm.h @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/src/FormFactory.cpp b/project/src/FormFactory.cpp index 7c96c6b..5afecba 100755 --- a/project/src/FormFactory.cpp +++ b/project/src/FormFactory.cpp @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp index 0a8d00c..f7d24ed 100755 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.cpp @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/src/PushClient.cpp b/project/src/PushClient.cpp index 6744efb..c38a578 100755 --- a/project/src/PushClient.cpp +++ b/project/src/PushClient.cpp @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/src/PushClientEntry.cpp b/project/src/PushClientEntry.cpp index a2ee94a..959b858 100755 --- a/project/src/PushClientEntry.cpp +++ b/project/src/PushClientEntry.cpp @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 // diff --git a/project/src/SettingForm.cpp b/project/src/SettingForm.cpp index df6ab45..06e7801 100755 --- a/project/src/SettingForm.cpp +++ b/project/src/SettingForm.cpp @@ -2,7 +2,7 @@ // Tizen Native SDK // Copyright (c) 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 //