Merge "Fix building error if we moved to NTB bluetooth stack" into tizen

author Arron Wang <arron.wang@intel.com>

Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)

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

Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)
author Arron Wang <arron.wang@intel.com>
Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)
diff --cc common/net_nfc_util.c
Simple merge
diff --cc daemon/net_nfc_server_process_handover.c
Simple merge
diff --cc packaging/nfc-manager-neard.spec
Simple merge
author	Arron Wang <arron.wang@intel.com>
	Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 1 Dec 2014 02:38:03 +0000 (18:38 -0800)
		1	2
common/net_nfc_util.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/net_nfc_server_process_handover.c	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/nfc-manager-neard.spec	patch \|	diff1 \|	diff2 \|	blob \| history