Merge branch '1.3-rel' (e0704368) 51/21351/2
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 11 Jul 2017 08:03:35 +0000 (10:03 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 11 Jul 2017 08:03:35 +0000 (10:03 +0200)
commit1b0d98b85c00b1eb557312b04850ca68f3d38593
tree41943c67a7f3ff62d619729d3d7e9e16fea6716c
parent64759a5445be9ef5f8f5abe3b943ba7b4a7fa3c4
parente070436866ee75054aea4a9772c4ec325cf9616b
Merge branch '1.3-rel' (e0704368)

Conflicts:
extlibs/mbedtls/SConscript

Change-Id: I936dd2dcc314cc5b16387a397d035e7e3753e58b
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
extlibs/mbedtls/SConscript
service/notification/unittest/SConscript