Merge branch 'master' into cloud-interface

author Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)

committer Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Mon, 7 Mar 2016 02:02:11 +0000 (11:02 +0900)
author Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)
committer Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 7 Mar 2016 02:02:11 +0000 (11:02 +0900)
diff --cc resource/csdk/stack/src/ocstack.c

index 0dda57c,b82065c..b82065c

mode 100644,100755..100644
--- 1/resource/csdk/stack/src/ocstack.c
--- 2/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
diff --cc service/resource-encapsulation/examples/linux/SampleResourceClient.cpp

index 61287a0,1d15dc8..1d15dc8

mode 100644,100755..100644
--- 1/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
--- 2/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
+++ b/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
author	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)
committer	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Mon, 7 Mar 2016 02:02:11 +0000 (11:02 +0900)
		1	2
resource/csdk/stack/src/ocstack.c	patch \|	diff1 \|	diff2 \|	blob \| history
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp	patch \|	diff1 \|	diff2 \|	blob \| history