Merge branch 'master' into cloud-interface
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 7 Mar 2016 02:02:11 +0000 (11:02 +0900)
commitb32f68877abda123144238d8aab343cf0a933199
tree24254e3d16e457b4df01e7e853edcfea5dd9a419
parent45c364268c4f5d575d98f4cd88b571b536c6cb17
parentf5805d8258eac0650ccdcb60864883b2aad7a866
Merge branch 'master' into cloud-interface

Change-Id: I7c493903fabad7e9444c5d1d16bd0d5cfca0c3fb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
resource/csdk/stack/src/ocstack.c
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp