Merge 1.3-rel (7d3afa78) 03/19903/5
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 19 May 2017 00:06:29 +0000 (02:06 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 19 May 2017 00:06:29 +0000 (02:06 +0200)
1.3-rel is ahead master, but merge all at once is problematic,
so I am trying in several steps, to be validated on CI
(see URL for history).

Change-Id: I5177f05d782fc22507e2032b2924d7d9cffdcb82
Origin: https://gerrit.iotivity.org/gerrit/#/c/19903/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/IPCA/unittests/SConscript
resource/csdk/connectivity/api/cacommon.h
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
service/notification/src/provider/NSProviderInterface.c

Simple merge
Simple merge
Simple merge