projects / platform / core / api / wifi-direct.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite9883acac354b07eae273dfc39ce3c336987c756
tree366b9397fc90509c503ea3d0cfcba9aa2c381873tree | snapshot
parent234870c8209580d6ba221d4a692e2a5a9554ecc7commit | diff
parent4fcbe0734748f3d3c45c6cf6a15ac5a00d8ad602commit | diff
Merge branch 'tizen_3.0' into tizen

Conflicts:
include/wifi-direct.h
packaging/capi-network-wifi-direct.spec

Change-Id: Id2326863999ddbd500a71f961a7513ed800c2c22
Signed-off-by: Yu jiung <jiung.yu@samsung.com>
packaging/capi-network-wifi-direct.spec diff1 | diff2 | blob | history
Domain: Network & Connectivity / WiFi;