From: Jaeyun Jeong Date: Thu, 2 May 2013 16:41:32 +0000 (+0900) Subject: Apply latest flora license. X-Git-Tag: submit/tizen_2.1/20130514.053823~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a6ed2e3bd61209ad741ec91dd144bcaaf507a56;p=apps%2Fcore%2Fpreloaded%2Fmessage-app.git Apply latest flora license. Change-Id: If760779bcf72bb3ab00af31974fcd638217d75b4 --- diff --git a/LICENSE b/LICENSE.Flora similarity index 91% rename from LICENSE rename to LICENSE.Flora index fd90a36..4a0af40 100755 --- a/LICENSE +++ 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 deleted file mode 100755 index e69de29..0000000 diff --git a/NOTICE.Flora b/NOTICE.Flora new file mode 100755 index 0000000..94d56df --- /dev/null +++ b/NOTICE.Flora @@ -0,0 +1,3 @@ +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/class0/msg-ui-class0-main.c b/class0/msg-ui-class0-main.c index 56073c0..77711e1 100755 --- a/class0/msg-ui-class0-main.c +++ b/class0/msg-ui-class0-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/class0/msg-ui-class0-main.h b/class0/msg-ui-class0-main.h index 5210ae6..1caf9ed 100755 --- a/class0/msg-ui-class0-main.h +++ b/class0/msg-ui-class0-main.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/common/msg-ui-bundle.h b/common/msg-ui-bundle.h index 3a34375..9e74de0 100755 --- a/common/msg-ui-bundle.h +++ b/common/msg-ui-bundle.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/common/msg-ui-common-utility.c b/common/msg-ui-common-utility.c index 0e5af10..8341b43 100755 --- a/common/msg-ui-common-utility.c +++ b/common/msg-ui-common-utility.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/common/msg-ui-common-utility.h b/common/msg-ui-common-utility.h index 8ee499c..059bbb8 100755 --- a/common/msg-ui-common-utility.h +++ b/common/msg-ui-common-utility.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/common/msg-ui-image-resource.h b/common/msg-ui-image-resource.h index 4118aee..f0ba9ca 100755 --- a/common/msg-ui-image-resource.h +++ b/common/msg-ui-image-resource.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/common/msg-ui-util.h b/common/msg-ui-util.h index 56504f2..4893f8c 100755 --- a/common/msg-ui-util.h +++ b/common/msg-ui-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/composer/include/msg-ui-composer-attachment.h b/composer/include/msg-ui-composer-attachment.h index 17890a1..d01716d 100755 --- a/composer/include/msg-ui-composer-attachment.h +++ b/composer/include/msg-ui-composer-attachment.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/composer/include/msg-ui-composer-body-callback.h b/composer/include/msg-ui-composer-body-callback.h index 3a81fa7..8ed322d 100755 --- a/composer/include/msg-ui-composer-body-callback.h +++ b/composer/include/msg-ui-composer-body-callback.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/composer/include/msg-ui-composer-body-page.h b/composer/include/msg-ui-composer-body-page.h index 605095f..166f415 100755 --- a/composer/include/msg-ui-composer-body-page.h +++ b/composer/include/msg-ui-composer-body-page.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/composer/include/msg-ui-composer-body.h b/composer/include/msg-ui-composer-body.h index d6ddabf..2623e14 100755 --- a/composer/include/msg-ui-composer-body.h +++ b/composer/include/msg-ui-composer-body.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/composer/include/msg-ui-composer-bubble.h b/composer/include/msg-ui-composer-bubble.h index 117c8f8..c1491d6 100755 --- a/composer/include/msg-ui-composer-bubble.h +++ b/composer/include/msg-ui-composer-bubble.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/composer/include/msg-ui-composer-common.h b/composer/include/msg-ui-composer-common.h index b065526..012255e 100755 --- a/composer/include/msg-ui-composer-common.h +++ b/composer/include/msg-ui-composer-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/composer/include/msg-ui-composer-data.h b/composer/include/msg-ui-composer-data.h index 3d31054..861acc6 100755 --- a/composer/include/msg-ui-composer-data.h +++ b/composer/include/msg-ui-composer-data.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/composer/include/msg-ui-composer-external.h b/composer/include/msg-ui-composer-external.h index 4a5a592..d7bfb6b 100755 --- a/composer/include/msg-ui-composer-external.h +++ b/composer/include/msg-ui-composer-external.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/composer/include/msg-ui-composer-main.h b/composer/include/msg-ui-composer-main.h index 9f0ae0a..87d9cac 100755 --- a/composer/include/msg-ui-composer-main.h +++ b/composer/include/msg-ui-composer-main.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/composer/include/msg-ui-composer-message-data.h b/composer/include/msg-ui-composer-message-data.h index 4e7d169..7a6f6b9 100755 --- a/composer/include/msg-ui-composer-message-data.h +++ b/composer/include/msg-ui-composer-message-data.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/composer/include/msg-ui-composer-message.h b/composer/include/msg-ui-composer-message.h index 39124b0..ee9171e 100755 --- a/composer/include/msg-ui-composer-message.h +++ b/composer/include/msg-ui-composer-message.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/composer/include/msg-ui-composer-pageduration.h b/composer/include/msg-ui-composer-pageduration.h index 8f65f68..8ff3e0a 100755 --- a/composer/include/msg-ui-composer-pageduration.h +++ b/composer/include/msg-ui-composer-pageduration.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/composer/include/msg-ui-composer-popup.h b/composer/include/msg-ui-composer-popup.h index f599a2d..e7065b1 100755 --- a/composer/include/msg-ui-composer-popup.h +++ b/composer/include/msg-ui-composer-popup.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/composer/include/msg-ui-composer-predictsearch.h b/composer/include/msg-ui-composer-predictsearch.h index c62a740..8356b20 100755 --- a/composer/include/msg-ui-composer-predictsearch.h +++ b/composer/include/msg-ui-composer-predictsearch.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/composer/include/msg-ui-composer-recipient-callback.h b/composer/include/msg-ui-composer-recipient-callback.h index b4f15d8..0b20e26 100755 --- a/composer/include/msg-ui-composer-recipient-callback.h +++ b/composer/include/msg-ui-composer-recipient-callback.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/composer/include/msg-ui-composer-recipient.h b/composer/include/msg-ui-composer-recipient.h index 1443e84..b213b55 100755 --- a/composer/include/msg-ui-composer-recipient.h +++ b/composer/include/msg-ui-composer-recipient.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/composer/include/msg-ui-composer-res.h b/composer/include/msg-ui-composer-res.h index 296a697..f33e8de 100755 --- a/composer/include/msg-ui-composer-res.h +++ b/composer/include/msg-ui-composer-res.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/composer/include/msg-ui-composer-string.h b/composer/include/msg-ui-composer-string.h index 82e9ef1..0638f3c 100755 --- a/composer/include/msg-ui-composer-string.h +++ b/composer/include/msg-ui-composer-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/composer/include/msg-ui-composer-subject.h b/composer/include/msg-ui-composer-subject.h index 1706f88..bf53dc9 100755 --- a/composer/include/msg-ui-composer-subject.h +++ b/composer/include/msg-ui-composer-subject.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/composer/src/bubble/msg-ui-composer-bubble-callback.c b/composer/src/bubble/msg-ui-composer-bubble-callback.c index 482ba64..ec70755 100755 --- a/composer/src/bubble/msg-ui-composer-bubble-callback.c +++ b/composer/src/bubble/msg-ui-composer-bubble-callback.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/composer/src/bubble/msg-ui-composer-bubble-list.c b/composer/src/bubble/msg-ui-composer-bubble-list.c index 1eaafeb..8d730df 100755 --- a/composer/src/bubble/msg-ui-composer-bubble-list.c +++ b/composer/src/bubble/msg-ui-composer-bubble-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/composer/src/bubble/msg-ui-composer-bubble-main.c b/composer/src/bubble/msg-ui-composer-bubble-main.c index caa33f0..3e582b3 100755 --- a/composer/src/bubble/msg-ui-composer-bubble-main.c +++ b/composer/src/bubble/msg-ui-composer-bubble-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/composer/src/bubble/msg-ui-composer-bubble-util.c b/composer/src/bubble/msg-ui-composer-bubble-util.c index 2134fb1..d2e1906 100755 --- a/composer/src/bubble/msg-ui-composer-bubble-util.c +++ b/composer/src/bubble/msg-ui-composer-bubble-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/composer/src/external/msg-ui-composer-external.c b/composer/src/external/msg-ui-composer-external.c index 49a78e0..4ed31a2 100755 --- a/composer/src/external/msg-ui-composer-external.c +++ b/composer/src/external/msg-ui-composer-external.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/composer/src/gadget/msg-ui-composer-gadget.c b/composer/src/gadget/msg-ui-composer-gadget.c index 94cefb8..ab70789 100755 --- a/composer/src/gadget/msg-ui-composer-gadget.c +++ b/composer/src/gadget/msg-ui-composer-gadget.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/composer/src/message/msg-ui-composer-message.c b/composer/src/message/msg-ui-composer-message.c index 8388def..3999cd9 100755 --- a/composer/src/message/msg-ui-composer-message.c +++ b/composer/src/message/msg-ui-composer-message.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/composer/src/ui-composer/msg-ui-composer-attachment.c b/composer/src/ui-composer/msg-ui-composer-attachment.c index 056c056..6bc783a 100755 --- a/composer/src/ui-composer/msg-ui-composer-attachment.c +++ b/composer/src/ui-composer/msg-ui-composer-attachment.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/composer/src/ui-composer/msg-ui-composer-body-callback.c b/composer/src/ui-composer/msg-ui-composer-body-callback.c index c018c7e..dc47302 100755 --- a/composer/src/ui-composer/msg-ui-composer-body-callback.c +++ b/composer/src/ui-composer/msg-ui-composer-body-callback.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/composer/src/ui-composer/msg-ui-composer-body-page.c b/composer/src/ui-composer/msg-ui-composer-body-page.c index e3f79f8..dbd7644 100755 --- a/composer/src/ui-composer/msg-ui-composer-body-page.c +++ b/composer/src/ui-composer/msg-ui-composer-body-page.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/composer/src/ui-composer/msg-ui-composer-body.c b/composer/src/ui-composer/msg-ui-composer-body.c index ea4dd72..07edc97 100755 --- a/composer/src/ui-composer/msg-ui-composer-body.c +++ b/composer/src/ui-composer/msg-ui-composer-body.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/composer/src/ui-composer/msg-ui-composer-common.c b/composer/src/ui-composer/msg-ui-composer-common.c index 6ac1eb0..484a50f 100755 --- a/composer/src/ui-composer/msg-ui-composer-common.c +++ b/composer/src/ui-composer/msg-ui-composer-common.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/composer/src/ui-composer/msg-ui-composer-main.c b/composer/src/ui-composer/msg-ui-composer-main.c index 2805cd2..b5690c5 100755 --- a/composer/src/ui-composer/msg-ui-composer-main.c +++ b/composer/src/ui-composer/msg-ui-composer-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/composer/src/ui-composer/msg-ui-composer-pageduration.c b/composer/src/ui-composer/msg-ui-composer-pageduration.c index b9d8383..910aa18 100755 --- a/composer/src/ui-composer/msg-ui-composer-pageduration.c +++ b/composer/src/ui-composer/msg-ui-composer-pageduration.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/composer/src/ui-composer/msg-ui-composer-popup.c b/composer/src/ui-composer/msg-ui-composer-popup.c index 644d45f..d6110e6 100755 --- a/composer/src/ui-composer/msg-ui-composer-popup.c +++ b/composer/src/ui-composer/msg-ui-composer-popup.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/composer/src/ui-composer/msg-ui-composer-predictsearch.c b/composer/src/ui-composer/msg-ui-composer-predictsearch.c index feeeb0c..231876f 100755 --- a/composer/src/ui-composer/msg-ui-composer-predictsearch.c +++ b/composer/src/ui-composer/msg-ui-composer-predictsearch.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/composer/src/ui-composer/msg-ui-composer-recipient-callback.c b/composer/src/ui-composer/msg-ui-composer-recipient-callback.c index aa73034..2f3a4ab 100755 --- a/composer/src/ui-composer/msg-ui-composer-recipient-callback.c +++ b/composer/src/ui-composer/msg-ui-composer-recipient-callback.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/composer/src/ui-composer/msg-ui-composer-recipient.c b/composer/src/ui-composer/msg-ui-composer-recipient.c index 8e79c9f..4580c5e 100755 --- a/composer/src/ui-composer/msg-ui-composer-recipient.c +++ b/composer/src/ui-composer/msg-ui-composer-recipient.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/composer/src/ui-composer/msg-ui-composer-subject.c b/composer/src/ui-composer/msg-ui-composer-subject.c index c00869e..b27463b 100755 --- a/composer/src/ui-composer/msg-ui-composer-subject.c +++ b/composer/src/ui-composer/msg-ui-composer-subject.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/composer/src/util/msg-ui-composer-util.c b/composer/src/util/msg-ui-composer-util.c index 06d8e12..6136fbb 100755 --- a/composer/src/util/msg-ui-composer-util.c +++ b/composer/src/util/msg-ui-composer-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/composer/src/util/msg-ui-composer-util.h b/composer/src/util/msg-ui-composer-util.h index 6c49942..8b57c9d 100755 --- a/composer/src/util/msg-ui-composer-util.h +++ b/composer/src/util/msg-ui-composer-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/dialog/message-dialog.c b/dialog/message-dialog.c index add2901..9fd620e 100755 --- a/dialog/message-dialog.c +++ b/dialog/message-dialog.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/dialog/message-dialog.h b/dialog/message-dialog.h index a03d235..1cba544 100755 --- a/dialog/message-dialog.h +++ b/dialog/message-dialog.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/main/CMakeLists.txt b/main/CMakeLists.txt index c4463aa..33203c9 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -67,6 +67,9 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_COMMON_DIR}/data/image/ DESTINATION ${IMGDIR} F INSTALL(DIRECTORY DESTINATION ${DATADIR}) #INSTALL(FILES ${CMAKE_SOURCE_MAIN_DIR}/${PROJECT_NAME}.ini DESTINATION share/process-info/ ) +#Install license file. +INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license RENAME ${PKGNAME}) + #EDJ file. ADD_CUSTOM_TARGET(${THREAD_GENLIST}.edj COMMAND edje_cc -id ${CMAKE_SOURCE_COMMON_DIR}/data/edc_image diff --git a/main/message.c b/main/message.c index 65263e3..175f474 100755 --- a/main/message.c +++ b/main/message.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/main/message.h b/main/message.h index 18aac2b..e0aa494 100755 --- a/main/message.h +++ b/main/message.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/packaging/org.tizen.message.spec b/packaging/org.tizen.message.spec index e4cc52e..4118d87 100755 --- a/packaging/org.tizen.message.spec +++ b/packaging/org.tizen.message.spec @@ -1,9 +1,9 @@ Name: org.tizen.message Summary: message application -Version: 0.8.49 +Version: 0.8.50 Release: 1 Group: devel -License: Samsung +License: Flora Source0: %{name}-%{version}.tar.gz Requires(post): /bin/touch Requires(post): /usr/bin/vconftool @@ -69,6 +69,7 @@ make #%{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install +mkdir -p %{buildroot}/usr/share/license %post vconftool set -t int db/private/org.tizen.message/font_size 1 -u 5000 -f @@ -90,8 +91,12 @@ ln -sf /usr/bin/ug-client /usr/ug/bin/msg-composer-efl /usr/ug/lib/*.so %dir /opt/usr/apps/org.tizen.message/data /usr/share/icons/default/small/*.png +/usr/share/license/%{name} %changelog +* Fri May 3 2013 Jaeyun Jeong +- Apply latest Flora license. + * Tue Apr 23 2013 Jaeyun Jeong - Change LICENSE file because the date in LICENSE is changed. diff --git a/setting/include/msg-ui-setting-callback.h b/setting/include/msg-ui-setting-callback.h index 0b8a063..ee4719f 100755 --- a/setting/include/msg-ui-setting-callback.h +++ b/setting/include/msg-ui-setting-callback.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/setting/include/msg-ui-setting-common-util.h b/setting/include/msg-ui-setting-common-util.h index 265bd6f..9b74fe9 100755 --- a/setting/include/msg-ui-setting-common-util.h +++ b/setting/include/msg-ui-setting-common-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/setting/include/msg-ui-setting-gadget.h b/setting/include/msg-ui-setting-gadget.h index 79b6a72..1284820 100755 --- a/setting/include/msg-ui-setting-gadget.h +++ b/setting/include/msg-ui-setting-gadget.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/setting/include/msg-ui-setting-main.h b/setting/include/msg-ui-setting-main.h index 22df034..a9ffa60 100755 --- a/setting/include/msg-ui-setting-main.h +++ b/setting/include/msg-ui-setting-main.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/setting/include/msg-ui-setting-mm-message.h b/setting/include/msg-ui-setting-mm-message.h index f2df6ad..facc921 100755 --- a/setting/include/msg-ui-setting-mm-message.h +++ b/setting/include/msg-ui-setting-mm-message.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/setting/include/msg-ui-setting-msg-service-wrapper.h b/setting/include/msg-ui-setting-msg-service-wrapper.h index acd08b3..a70bf31 100755 --- a/setting/include/msg-ui-setting-msg-service-wrapper.h +++ b/setting/include/msg-ui-setting-msg-service-wrapper.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/setting/include/msg-ui-setting-spam-setting.h b/setting/include/msg-ui-setting-spam-setting.h index 2541f84..438ff13 100755 --- a/setting/include/msg-ui-setting-spam-setting.h +++ b/setting/include/msg-ui-setting-spam-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/setting/include/msg-ui-setting-text-message.h b/setting/include/msg-ui-setting-text-message.h index e9b5740..147308a 100755 --- a/setting/include/msg-ui-setting-text-message.h +++ b/setting/include/msg-ui-setting-text-message.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/setting/include/msg-ui-setting-types.h b/setting/include/msg-ui-setting-types.h index e3c4b21..fb2d329 100755 --- a/setting/include/msg-ui-setting-types.h +++ b/setting/include/msg-ui-setting-types.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/setting/src/main/msg-ui-setting-callback.c b/setting/src/main/msg-ui-setting-callback.c index d6a52a7..8ea0ea9 100755 --- a/setting/src/main/msg-ui-setting-callback.c +++ b/setting/src/main/msg-ui-setting-callback.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/setting/src/main/msg-ui-setting-common-util.c b/setting/src/main/msg-ui-setting-common-util.c index a111868..e09ca62 100755 --- a/setting/src/main/msg-ui-setting-common-util.c +++ b/setting/src/main/msg-ui-setting-common-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/setting/src/main/msg-ui-setting-gadget.c b/setting/src/main/msg-ui-setting-gadget.c index 1d4d73f..3cfac9b 100755 --- a/setting/src/main/msg-ui-setting-gadget.c +++ b/setting/src/main/msg-ui-setting-gadget.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/setting/src/main/msg-ui-setting-main.c b/setting/src/main/msg-ui-setting-main.c index a17660b..9b9ff78 100755 --- a/setting/src/main/msg-ui-setting-main.c +++ b/setting/src/main/msg-ui-setting-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/setting/src/main/msg-ui-setting-msg-service-wrapper.c b/setting/src/main/msg-ui-setting-msg-service-wrapper.c index 206dadb..de2e11c 100755 --- a/setting/src/main/msg-ui-setting-msg-service-wrapper.c +++ b/setting/src/main/msg-ui-setting-msg-service-wrapper.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/setting/src/multimedia/msg-ui-setting-mm-message.c b/setting/src/multimedia/msg-ui-setting-mm-message.c index 1be0615..3c1cbbe 100755 --- a/setting/src/multimedia/msg-ui-setting-mm-message.c +++ b/setting/src/multimedia/msg-ui-setting-mm-message.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/setting/src/multimedia/msg-ui-setting-mm-recv-option.c b/setting/src/multimedia/msg-ui-setting-mm-recv-option.c index ea409e6..976815b 100755 --- a/setting/src/multimedia/msg-ui-setting-mm-recv-option.c +++ b/setting/src/multimedia/msg-ui-setting-mm-recv-option.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/setting/src/spam/msg-ui-setting-spam-block-number.c b/setting/src/spam/msg-ui-setting-spam-block-number.c index 974684e..09a69f4 100755 --- a/setting/src/spam/msg-ui-setting-spam-block-number.c +++ b/setting/src/spam/msg-ui-setting-spam-block-number.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/setting/src/spam/msg-ui-setting-spam-block-word.c b/setting/src/spam/msg-ui-setting-spam-block-word.c index 16c9696..9152a5b 100755 --- a/setting/src/spam/msg-ui-setting-spam-block-word.c +++ b/setting/src/spam/msg-ui-setting-spam-block-word.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/setting/src/spam/msg-ui-setting-spam-setting.c b/setting/src/spam/msg-ui-setting-spam-setting.c index 2b06ecf..44f5749 100755 --- a/setting/src/spam/msg-ui-setting-spam-setting.c +++ b/setting/src/spam/msg-ui-setting-spam-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/setting/src/text/msg-ui-setting-text-message.c b/setting/src/text/msg-ui-setting-text-message.c index 1d55d42..21f6960 100755 --- a/setting/src/text/msg-ui-setting-text-message.c +++ b/setting/src/text/msg-ui-setting-text-message.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/setting/src/text/msg-ui-setting-text-service-center.c b/setting/src/text/msg-ui-setting-text-service-center.c index 89d22e3..3988a2d 100755 --- a/setting/src/text/msg-ui-setting-text-service-center.c +++ b/setting/src/text/msg-ui-setting-text-service-center.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/thread/include/msg-ui-thread-main.h b/thread/include/msg-ui-thread-main.h index 6dfea7b..4d079e9 100755 --- a/thread/include/msg-ui-thread-main.h +++ b/thread/include/msg-ui-thread-main.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/thread/src/msg-ui-thread-callback.c b/thread/src/msg-ui-thread-callback.c index 373f785..cb9e995 100755 --- a/thread/src/msg-ui-thread-callback.c +++ b/thread/src/msg-ui-thread-callback.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/thread/src/msg-ui-thread-list.c b/thread/src/msg-ui-thread-list.c index 973948a..8677058 100755 --- a/thread/src/msg-ui-thread-list.c +++ b/thread/src/msg-ui-thread-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/thread/src/msg-ui-thread-main.c b/thread/src/msg-ui-thread-main.c index 30897dc..3bd9735 100755 --- a/thread/src/msg-ui-thread-main.c +++ b/thread/src/msg-ui-thread-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/thread/src/msg-ui-thread-util.c b/thread/src/msg-ui-thread-util.c index 19ad1a0..651fab7 100755 --- a/thread/src/msg-ui-thread-util.c +++ b/thread/src/msg-ui-thread-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/viewer/include/msg-ui-viewer-drm-list.h b/viewer/include/msg-ui-viewer-drm-list.h index 7763220..83a1d24 100755 --- a/viewer/include/msg-ui-viewer-drm-list.h +++ b/viewer/include/msg-ui-viewer-drm-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/viewer/include/msg-ui-viewer-drm-utility.h b/viewer/include/msg-ui-viewer-drm-utility.h index b045686..e8d799c 100755 --- a/viewer/include/msg-ui-viewer-drm-utility.h +++ b/viewer/include/msg-ui-viewer-drm-utility.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/viewer/include/msg-ui-viewer-main.h b/viewer/include/msg-ui-viewer-main.h index e75d8d8..6cff4dd 100755 --- a/viewer/include/msg-ui-viewer-main.h +++ b/viewer/include/msg-ui-viewer-main.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/viewer/include/msg-ui-viewer-play-view.h b/viewer/include/msg-ui-viewer-play-view.h index a4966c2..ec2daec 100755 --- a/viewer/include/msg-ui-viewer-play-view.h +++ b/viewer/include/msg-ui-viewer-play-view.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/viewer/include/msg-ui-viewer-types.h b/viewer/include/msg-ui-viewer-types.h index 54a52d8..5bc62e3 100755 --- a/viewer/include/msg-ui-viewer-types.h +++ b/viewer/include/msg-ui-viewer-types.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/viewer/include/msg-ui-viewer-utility.h b/viewer/include/msg-ui-viewer-utility.h index 18c86dd..27158e7 100755 --- a/viewer/include/msg-ui-viewer-utility.h +++ b/viewer/include/msg-ui-viewer-utility.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/viewer/smil-player/include/msg-smil-content-manager.h b/viewer/smil-player/include/msg-smil-content-manager.h index 59894e6..c7ebeff 100755 --- a/viewer/smil-player/include/msg-smil-content-manager.h +++ b/viewer/smil-player/include/msg-smil-content-manager.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/viewer/smil-player/include/msg-smil-event-manager.h b/viewer/smil-player/include/msg-smil-event-manager.h index 899fde5..fd188fb 100755 --- a/viewer/smil-player/include/msg-smil-event-manager.h +++ b/viewer/smil-player/include/msg-smil-event-manager.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/viewer/smil-player/include/msg-smil-player-interface.h b/viewer/smil-player/include/msg-smil-player-interface.h index e9dae1e..55dab63 100755 --- a/viewer/smil-player/include/msg-smil-player-interface.h +++ b/viewer/smil-player/include/msg-smil-player-interface.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/viewer/smil-player/include/msg-smil-player.h b/viewer/smil-player/include/msg-smil-player.h index 17c806f..84f8da9 100755 --- a/viewer/smil-player/include/msg-smil-player.h +++ b/viewer/smil-player/include/msg-smil-player.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/viewer/smil-player/include/msg-smil-render.h b/viewer/smil-player/include/msg-smil-render.h index f2b34d8..bf3aefa 100755 --- a/viewer/smil-player/include/msg-smil-render.h +++ b/viewer/smil-player/include/msg-smil-render.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/viewer/smil-player/include/msg-smil-types.h b/viewer/smil-player/include/msg-smil-types.h index f7a8c15..0e22e43 100755 --- a/viewer/smil-player/include/msg-smil-types.h +++ b/viewer/smil-player/include/msg-smil-types.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/viewer/smil-player/include/msg-smil-util.h b/viewer/smil-player/include/msg-smil-util.h index cabe64b..a2a5457 100755 --- a/viewer/smil-player/include/msg-smil-util.h +++ b/viewer/smil-player/include/msg-smil-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/viewer/smil-player/src/msg-smil-content-manager.c b/viewer/smil-player/src/msg-smil-content-manager.c index c4f1000..adf5bdb 100755 --- a/viewer/smil-player/src/msg-smil-content-manager.c +++ b/viewer/smil-player/src/msg-smil-content-manager.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/viewer/smil-player/src/msg-smil-event-manager.c b/viewer/smil-player/src/msg-smil-event-manager.c index 1e22ba1..690f59c 100755 --- a/viewer/smil-player/src/msg-smil-event-manager.c +++ b/viewer/smil-player/src/msg-smil-event-manager.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/viewer/smil-player/src/msg-smil-media-render.c b/viewer/smil-player/src/msg-smil-media-render.c index 6f10f4d..0f3d5b9 100755 --- a/viewer/smil-player/src/msg-smil-media-render.c +++ b/viewer/smil-player/src/msg-smil-media-render.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/viewer/smil-player/src/msg-smil-player-interface.c b/viewer/smil-player/src/msg-smil-player-interface.c index ae47abb..0fbe81d 100755 --- a/viewer/smil-player/src/msg-smil-player-interface.c +++ b/viewer/smil-player/src/msg-smil-player-interface.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/viewer/smil-player/src/msg-smil-player.c b/viewer/smil-player/src/msg-smil-player.c index 77898e6..f992599 100755 --- a/viewer/smil-player/src/msg-smil-player.c +++ b/viewer/smil-player/src/msg-smil-player.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/viewer/smil-player/src/msg-smil-render.c b/viewer/smil-player/src/msg-smil-render.c index 14d1899..d8d456d 100755 --- a/viewer/smil-player/src/msg-smil-render.c +++ b/viewer/smil-player/src/msg-smil-render.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/viewer/smil-player/src/msg-smil-text-render.c b/viewer/smil-player/src/msg-smil-text-render.c index a80a80f..93c7570 100755 --- a/viewer/smil-player/src/msg-smil-text-render.c +++ b/viewer/smil-player/src/msg-smil-text-render.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/viewer/smil-player/src/msg-smil-util.c b/viewer/smil-player/src/msg-smil-util.c index 2787b7c..9544772 100755 --- a/viewer/smil-player/src/msg-smil-util.c +++ b/viewer/smil-player/src/msg-smil-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/viewer/src/msg-ui-viewer-callback.c b/viewer/src/msg-ui-viewer-callback.c index 7506df8..59fe082 100755 --- a/viewer/src/msg-ui-viewer-callback.c +++ b/viewer/src/msg-ui-viewer-callback.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/viewer/src/msg-ui-viewer-drm-list.c b/viewer/src/msg-ui-viewer-drm-list.c index 7aa5a40..438752d 100755 --- a/viewer/src/msg-ui-viewer-drm-list.c +++ b/viewer/src/msg-ui-viewer-drm-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/viewer/src/msg-ui-viewer-drm-utility.c b/viewer/src/msg-ui-viewer-drm-utility.c index ad1205f..36aed17 100755 --- a/viewer/src/msg-ui-viewer-drm-utility.c +++ b/viewer/src/msg-ui-viewer-drm-utility.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/viewer/src/msg-ui-viewer-gadget.c b/viewer/src/msg-ui-viewer-gadget.c index 6086e8b..b1d5540 100755 --- a/viewer/src/msg-ui-viewer-gadget.c +++ b/viewer/src/msg-ui-viewer-gadget.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/viewer/src/msg-ui-viewer-main.c b/viewer/src/msg-ui-viewer-main.c index 07dab7e..d41c4f3 100755 --- a/viewer/src/msg-ui-viewer-main.c +++ b/viewer/src/msg-ui-viewer-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/viewer/src/msg-ui-viewer-play-view-attachment.c b/viewer/src/msg-ui-viewer-play-view-attachment.c index 06bff8d..7284c31 100755 --- a/viewer/src/msg-ui-viewer-play-view-attachment.c +++ b/viewer/src/msg-ui-viewer-play-view-attachment.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/viewer/src/msg-ui-viewer-play-view-help-page.c b/viewer/src/msg-ui-viewer-play-view-help-page.c index 955859d..b38a8d3 100755 --- a/viewer/src/msg-ui-viewer-play-view-help-page.c +++ b/viewer/src/msg-ui-viewer-play-view-help-page.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/viewer/src/msg-ui-viewer-play-view-main.c b/viewer/src/msg-ui-viewer-play-view-main.c index abd2ec0..365ccc7 100755 --- a/viewer/src/msg-ui-viewer-play-view-main.c +++ b/viewer/src/msg-ui-viewer-play-view-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/viewer/src/msg-ui-viewer-play-view-options.c b/viewer/src/msg-ui-viewer-play-view-options.c index e9370b5..de4ec8b 100755 --- a/viewer/src/msg-ui-viewer-play-view-options.c +++ b/viewer/src/msg-ui-viewer-play-view-options.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/viewer/src/msg-ui-viewer-play-view-play-controller.c b/viewer/src/msg-ui-viewer-play-view-play-controller.c index bfe25a1..7d98c9f 100755 --- a/viewer/src/msg-ui-viewer-play-view-play-controller.c +++ b/viewer/src/msg-ui-viewer-play-view-play-controller.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/viewer/src/msg-ui-viewer-play-view-volume-bar.c b/viewer/src/msg-ui-viewer-play-view-volume-bar.c index 8298f56..b5b903a 100755 --- a/viewer/src/msg-ui-viewer-play-view-volume-bar.c +++ b/viewer/src/msg-ui-viewer-play-view-volume-bar.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/viewer/src/msg-ui-viewer-utility.c b/viewer/src/msg-ui-viewer-utility.c index b395d85..0ca7fd2 100755 --- a/viewer/src/msg-ui-viewer-utility.c +++ b/viewer/src/msg-ui-viewer-utility.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 *