summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-04-22 12:03:26 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-04-22 12:06:50 (GMT)
commit9fa7ae61cada4c9ea1123b65b3d49375f545c3d6 (patch)
tree81367c47e2626e9a9a1c635441d27f413d40cd29
parent50b37d47bcbb3c7ad06faaa4ea9082917488a4fb (diff)
parent329f47761c28083c166c81182dcc0c8136f77fa0 (diff)
downloadug-wifi-direct-9fa7ae61cada4c9ea1123b65b3d49375f545c3d6.zip
ug-wifi-direct-9fa7ae61cada4c9ea1123b65b3d49375f545c3d6.tar.gz
ug-wifi-direct-9fa7ae61cada4c9ea1123b65b3d49375f545c3d6.tar.bz2
Merge branch 'master' into tizen_2.1
Change-Id: I9ca0b18b96de9be5bbb9217e50511d65e60c2d23
-rw-r--r--LICENSE.Flora6
-rwxr-xr-xdebian/changelog8
-rwxr-xr-xpackaging/libug-setting-wifidirect-efl.spec2
3 files changed, 12 insertions, 4 deletions
diff --git a/LICENSE.Flora b/LICENSE.Flora
index 9c95663..fd90a36 100644
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
Flora License
-Version 1.0, May, 2012
+Version 1.0, April, 2013
http://floralicense.org/license/
@@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
"Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Compatibility Definition Document
-and passes the Compatibility Test Suite as defined from time to time
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
by the Tizen Technical Steering Group and certified by the Tizen
Association or its designated agent.
diff --git a/debian/changelog b/debian/changelog
index 2035f6c..d2cb5ae 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (1.0.15) precise; urgency=low
+
+ * License file changed
+ * Git: rsa/apps/home/ug-wifi-direct
+ * Tag: libug-setting-wifidirect-efl_1.0.15
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com> Mon, 22 Apr 2013 19:52:15 +0900
+
ug-setting-wifidirect-efl (1.0.14) precise; urgency=low
* Fix bug N_SE-34398(Wrong PIN message not displayed)
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 2dc6ca2..8abd8cf 100755
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
Name: libug-setting-wifidirect-efl
Summary: Wi-Fi Direct setting UI gadget
-Version: 1.0.14
+Version: 1.0.15
Release: 1
Group: TO_BE_FILLED
License: Flora License