Merge branch 'master' into connectivity-abstraction
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Mon, 8 Dec 2014 21:56:40 +0000 (13:56 -0800)
committerSudarshan Prasad <sudarshan.prasad@intel.com>
Mon, 8 Dec 2014 21:56:40 +0000 (13:56 -0800)
commit88df85f0c20992acba7c96a85a1007916923b448
tree1115aedbce5704f079b0f0f2fbf2d52499f51e6e
parent9bd23c44c35da6be43efb36a3deb30f69536a196
parent4a80d83f72a9e3586f866e6797ed50cae75158c6
Merge branch 'master' into connectivity-abstraction

Conflicts:
resource/csdk/makefile
resource/csdk/stack/include/internal/ocresource.h
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/src/ocstack.c

Change-Id: Ia681bc1b72f2611a0c51c36a58451bd409e1ddd1
resource/csdk/makefile
resource/csdk/stack/include/internal/ocresourcehandler.h
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/samples/linux/SimpleClientServer/makefile
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c