Merge "Add set callback API to get Wi-Fi Direct state using vconf" into tizen

author taesub kim <taesub.kim@samsung.com>

Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)
author taesub kim <taesub.kim@samsung.com>
Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)
diff --cc packaging/capi-network-wifi-direct.spec
Simple merge
diff --cc src/wifi-direct-client-proxy.c
Simple merge
diff --cc test/test-wifi-direct.c
Simple merge
author	taesub kim <taesub.kim@samsung.com>
	Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 17 Jun 2016 01:48:33 +0000 (18:48 -0700)
		1	2
packaging/capi-network-wifi-direct.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/wifi-direct-client-proxy.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-wifi-direct.c	patch \|	diff1 \|	diff2 \|	blob \| history