summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsunil85.kim <sunil85.kim@samsung.com>2013-05-02 13:47:11 +0900
committersunil85.kim <sunil85.kim@samsung.com>2013-05-02 13:47:11 +0900
commitd6de7588bf62a61f72038e3ea43b4d6262178221 (patch)
tree55d219f1301e968dffdabaab97d521daaedc7c8a
parent2f49eeeecab84d47c71dc98d236f4c32c026c0eb (diff)
downloadnet-popup-d6de7588bf62a61f72038e3ea43b4d6262178221.tar.gz
net-popup-d6de7588bf62a61f72038e3ea43b4d6262178221.tar.bz2
net-popup-d6de7588bf62a61f72038e3ea43b4d6262178221.zip
Update for tizen_2.1
-rw-r--r--LICENSE.Flora22
-rw-r--r--NOTICE2
-rw-r--r--packaging/org.tizen.net-popup.spec2
3 files changed, 13 insertions, 13 deletions
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 f37f329..2c574b9 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.Flora file for Flora License terms and conditions.
diff --git a/packaging/org.tizen.net-popup.spec b/packaging/org.tizen.net-popup.spec
index 4afe893..9b6adb9 100644
--- a/packaging/org.tizen.net-popup.spec
+++ b/packaging/org.tizen.net-popup.spec
@@ -3,7 +3,7 @@
Name: org.tizen.net-popup
Summary: Network Notification Popup application
-Version: 0.2.1_13
+Version: 0.2.1_14
Release: 1
Group: App/Network
License: Flora License