Merge branch '1.3-rel' (95fd9f5b) 55/20255/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 15 Jun 2017 22:53:50 +0000 (00:53 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 15 Jun 2017 22:53:50 +0000 (00:53 +0200)
Change-Id: I5b229d7413ab206f635548ff6af82fabd5edc8af
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/connectivity/api/cacommon.h
resource/csdk/include/octypes.h
resource/csdk/stack/src/ocserverrequest.c
resource/src/InProcServerWrapper.cpp

Simple merge
Simple merge