Merge branch 'master' into cloud-interface 33/18433/3
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 3 Apr 2017 04:20:22 +0000 (13:20 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 4 Apr 2017 04:00:33 +0000 (04:00 +0000)
Change-Id: I90cc0049c72082a1ce630e9c7bade9d67e1afd0f
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
1  2 
cloud/samples/client/SConscript
cloud/samples/client/thin_light/thin_room_light.cpp
resource/csdk/stack/src/ocstack.c

Simple merge