summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-05-03 10:37:34 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-05-03 10:37:38 (GMT)
commit3f391b9c3aac89ede3b2df0f526886a7d8770f4c (patch)
treee4fa37581ac47cf85e616474691eb11aa1d07bdb
parentf5421bd03437059b7060325b7f739eeb7a4f9929 (diff)
parent201eaa18fb2415adc29e7bca6ddb0360b2ff0810 (diff)
downloadug-wifi-direct-3f391b9c3aac89ede3b2df0f526886a7d8770f4c.zip
ug-wifi-direct-3f391b9c3aac89ede3b2df0f526886a7d8770f4c.tar.gz
ug-wifi-direct-3f391b9c3aac89ede3b2df0f526886a7d8770f4c.tar.bz2
Merge branch 'master' into tizen_2.1
Change-Id: I0eebca9bc5097e64a1cb2862f468f805562efe9f
-rw-r--r--NOTICE2
-rwxr-xr-xdebian/changelog7
-rwxr-xr-xpackaging/libug-setting-wifidirect-efl.spec2
3 files changed, 9 insertions, 2 deletions
diff --git a/NOTICE b/NOTICE
index 37c5da0..3969942 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.1.
-Please, see the LICENSE.Flora file for Flora License terms and conditions.
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.
diff --git a/debian/changelog b/debian/changelog
index 6ba32dc..e767e6b 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ug-setting-wifidirect-efl (1.0.19) precise; urgency=low
+
+ * NOTICE file updated
+ * Git: rsa/apps/home/ug-wifi-direct
+ * Tag: libug-setting-wifidirect-efl_1.0.19
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com> Fri, 3 May 2013 19:03:11 +0900
ug-setting-wifidirect-efl (1.0.18) precise; urgency=low
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 25c902e..92c2f82 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.18
+Version: 1.0.19
Release: 1
Group: TO_BE_FILLED
License: Flora License