Merge "Add support for WPS2-PSK security type in Security property of service interfa... accepted/tizen/common/20160614.144019 accepted/tizen/ivi/20160614.103653 accepted/tizen/mobile/20160614.103642 accepted/tizen/tv/20160614.103619 accepted/tizen/wearable/20160614.103626 submit/tizen/20160614.053635
authortaesub kim <taesub.kim@samsung.com>
Tue, 14 Jun 2016 04:30:50 +0000 (21:30 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 14 Jun 2016 04:30:50 +0000 (21:30 -0700)
1  2 
gsupplicant/supplicant.c
src/network.c
src/service.c

Simple merge
diff --cc src/network.c
Simple merge
diff --cc src/service.c
Simple merge