Merge branch 1.3-rel (22cb0dbe) 67/20167/8
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sat, 20 May 2017 10:22:22 +0000 (12:22 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 22 May 2017 15:36:51 +0000 (15:36 +0000)
https://gerrit.iotivity.org/gerrit/19925

Change-Id: Ib63aa289e91cc5926946786ae2ce03525d83a37c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/20167/

1  2 
resource/IPCA/samples/ElevatorClient/ElevatorClient.cpp
resource/IPCA/unittests/IPCAElevatorClient.cpp
resource/IPCA/unittests/ipcaunittests.cpp
resource/c_common/platform_features.h
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/stack/octbstack_product_secured.def

Simple merge