projects / platform / core / api / wifi-direct.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 234870c 4fcbe07)
Merge branch 'tizen_3.0' into tizen 81/110081/1 accepted/tizen/common/20170207.062007 accepted/tizen/ivi/20170207.092053 accepted/tizen/mobile/20170207.092011 accepted/tizen/tv/20170207.092027 accepted/tizen/wearable/20170207.092041 submit/tizen/20170207.045631
authorYu Jiung <jiung.yu@samsung.com>
Fri, 13 Jan 2017 01:29:59 +0000 (10:29 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Fri, 13 Jan 2017 01:30:15 +0000 (10:30 +0900)
Conflicts:
include/wifi-direct.h
packaging/capi-network-wifi-direct.spec

Change-Id: Id2326863999ddbd500a71f961a7513ed800c2c22
Signed-off-by: Yu jiung <jiung.yu@samsung.com>
1  2 
packaging/capi-network-wifi-direct.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/capi-network-wifi-direct.spec
index 4706046,ea8b87d..0df93c2
--- 1/packaging/capi-network-wifi-direct.spec
--- 2/packaging/capi-network-wifi-direct.spec
+++ b/packaging/capi-network-wifi-direct.spec
@@@ -1,9 -1,6 +1,9 @@@
 +# Do not provide .so automatically for the extensions.
 +%global __provides_exclude_from ^.*\\.extension
 +
  Name:       capi-network-wifi-direct
  Summary:    Network WiFi-Direct Library
- Version:    1.2.76
+ Version:    1.2.77
  Release:    1
  Group:      Network & Connectivity/API
  License:    Apache-2.0
Domain: Network & Connectivity / WiFi;