Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Mon, 6 Jun 2016 18:04:17 +0000 (11:04 -0700)
committerDavid Antler <david.a.antler@intel.com>
Mon, 6 Jun 2016 18:04:17 +0000 (11:04 -0700)
commit8031c99214e4213a202edef846de68ad5f080fa0
treeb3c74bb0bed040bb9c27a17a90ea6619eb508b96
parent15369e5c03818f3cbc6f4084e729aae089ea94ef
parent127bad8c8e5c7a4a82fec0078c77b407ee596cec
Merge branch 'master' into windows-port

Change-Id: I87c2e5ee2d6c9574c2a50d83256d6845a340fd86
Signed-off-by: David Antler <david.a.antler@intel.com>
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/include/StringConstants.h
resource/src/CAManager.cpp