Merged "fixed the dependency issue between RM and BWT (IOT-731/IOT-712)"
authorjihwan.seo <jihwan.seo@samsung.com>
Mon, 5 Oct 2015 13:35:46 +0000 (22:35 +0900)
committerPatrick Lankswert <patrick.lankswert@intel.com>
Mon, 5 Oct 2015 22:15:20 +0000 (22:15 +0000)
commit5783dcbc1b4a1a33d8b8d8c82b8f94dfb26cb16d
tree8082732f165cd2a4644c3dd94c79bd97788de85b
parent7ab2606923ae72b5e46b221cc198bbbe3443e910
Merged "fixed the dependency issue between RM and BWT (IOT-731/IOT-712)"

I have fixed to conflict with Change 2825,
when Change 3347 is failed to merge for v1.0.0 branch.

https://gerrit.iotivity.org/gerrit/#/c/2825/
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Change-Id: I5b781d24ff8a7c18f4e479e854cd416b9d173b29
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3497
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
resource/csdk/connectivity/inc/cablockwisetransfer.h
resource/csdk/connectivity/inc/caprotocolmessage.h
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/caprotocolmessage.c