Merge branch '1.3-rel' (c22b1d43) 87/20187/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 26 May 2017 10:34:52 +0000 (12:34 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 26 May 2017 10:34:52 +0000 (12:34 +0200)
Change-Id: I5307f0ae0ac08a9490ff62f245c1ffd979ae00f7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/stack/src/ocstack.c

Simple merge