Merge branch '1.3-rel' (c95aa699) 05/20705/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Mon, 12 Jun 2017 16:31:15 +0000 (18:31 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Mon, 12 Jun 2017 16:33:01 +0000 (16:33 +0000)
commitf0eff22bfb87dc0539fd1fc8d58b1e3f386d9edc
tree354e96dd079a75a0d02124236bee3c2e1dd70ed2
parent2df9c51767694548149665181801b66cb2a89b83
parentc95aa699e0cd4a1a6b98f329312f143c5d0e6fc3
Merge branch '1.3-rel' (c95aa699)

Conflicts:
extlibs/gtest/SConscript
resource/c_common/octimer/include/octimer.h
resource/c_common/octimer/src/octimer.c

Change-Id: I0092ab525bb2d70f21ea608422423f8862fe7df4
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
15 files changed:
extlibs/libcoap/SConscript
resource/c_common/SConscript
resource/c_common/octimer/include/octimer.h
resource/c_common/octimer/src/octimer.c
resource/c_common/unittests/SConscript
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/logger/SConscript
resource/csdk/security/SConscript
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/samples/tizen/build/scons/SConscript
resource/csdk/stack/src/occlientcb.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicgroup.c