Merge branch 'master' into windows-port 59/8259/1
authorDavid Antler <david.a.antler@intel.com>
Fri, 20 May 2016 21:31:54 +0000 (14:31 -0700)
committerDavid Antler <david.a.antler@intel.com>
Fri, 20 May 2016 21:31:54 +0000 (14:31 -0700)
commit9c42f3fe634ac3ee088e9a7592a35f319549f745
treed3abb9ab8cd5fdbe90586895de7e8b6da488fbc3
parent02ecf78243cc5c160c97f8684db7860f3ce406d0
parentd3db9c1b1dc3f3c3478cddf615dca728c895040b
Merge branch 'master' into windows-port

Change-Id: Iea39b951591a8f6a72285cf457b83f9c96e2e772
Signed-off-by: David Antler <david.a.antler@intel.com>
16 files changed:
SConstruct
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/logger/SConscript
resource/csdk/logger/src/logger.c
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/include/octypes.h
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oickeepalive.c
resource/examples/SConscript