Merge "Merge branch '1.3-rel' (5cfded4d) into 'master'"
authorDan Mihai <Daniel.Mihai@microsoft.com>
Thu, 9 Nov 2017 20:48:27 +0000 (20:48 +0000)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Thu, 9 Nov 2017 20:48:27 +0000 (20:48 +0000)
14 files changed:
1  2 
build_common/SConscript
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/csrresource.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditordoxm.c

Simple merge