projects / platform / core / api / wifi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0a6ce5 e4a576b)
Fix merge conflict accepted/tizen_4.0_unified accepted/tizen/4.0/unified/20180307.071417 submit/tizen_4.0/20180306.081613
authorTaesoo Jun <steve.jun@samsung.com>
Mon, 5 Mar 2018 10:13:16 +0000 (19:13 +0900)
committerTaesoo Jun <steve.jun@samsung.com>
Mon, 5 Mar 2018 10:13:16 +0000 (19:13 +0900)
Change-Id: I601af06589559dc22b7fd110f102e98cacd69b23

1  2 
include/wifi.h patch | diff1 | diff2 | blob | history

diff --cc include/wifi.h
Simple merge
Domain: Network & Connectivity / WiFi;