Merge branch 'master' into ra.to.merge 36/2436/1
authorMandeep Shetty <mandeep.shetty@intel.com>
Thu, 10 Sep 2015 00:58:44 +0000 (17:58 -0700)
committerMandeep Shetty <mandeep.shetty@intel.com>
Thu, 10 Sep 2015 00:58:44 +0000 (17:58 -0700)
commitc7947c2aac0d24b278b7198c3f45e4bc1a70482e
treef300473b0a33b7caf329c926512401212fd68dbb
parent8240c09721afa1381f1279b8278e089147e64b93
parentef100c827ac12e15dbd51bc32df1c448646c3438
Merge branch 'master' into ra.to.merge

Conflicts:
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp

Change-Id: I70ecb709845861789f326053b2135ca964bd21a5
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Readme.scons.txt
build_common/SConscript
resource/csdk/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp