From: sunil85.kim Date: Thu, 2 May 2013 04:46:43 +0000 (+0900) Subject: Update for tizen_2.1 X-Git-Tag: accepted/tizen/20130530.164527~1 X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fug-mobile-ap.git;a=commitdiff_plain;h=f97d77a10e95de289b90dcb149a42d7a03753c87 Update for tizen_2.1 Change-Id: I515e463506d8cc66a1dd3134570db1b68a2ed1a3 --- diff --git a/LICENSE.Flora b/LICENSE.Flora index 03f0c77..571fe79 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -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 diff --git a/NOTICE b/NOTICE index 3997999..42ac28e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. +Except as noted, this software is licensed under Flora License, Version 1.1 Please, see the LICENSE file for Flora License terms and conditions. diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec index 52483ed..0daf1bd 100644 --- a/packaging/ug-setting-mobileap-efl.spec +++ b/packaging/ug-setting-mobileap-efl.spec @@ -3,7 +3,7 @@ Name: ug-setting-mobileap-efl Summary: Tethering UI Gadget Library -Version: 0.1.163 +Version: 0.1.164 Release: 1 Group: TO_BE/FILLED_IN License: Flora License Version 1.0