projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62fc0d6) | patch
Merge from master to CA branch
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 10:31:14 +0000 (02:31 -0800)
committerSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 10:49:52 +0000 (02:49 -0800)
commit17f82e70a3815536a6cd3eb6aa4dc0c3a49cdcad
treee6598078470f203c602dd6e4b337679c9772dab8tree | snapshot
parent62fc0d6eb31516728d66eef58a4d2e6b498de23ccommit | diff
Merge from master to CA branch

Change-Id: If6c0c7db4d8212ce74e523ca03c0ebd7eca024d1
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
resource/csdk/occoap/src/occoap.c diff | blob | history
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp diff | blob | history
resource/examples/makefile diff | blob | history
resource/include/OCPlatform.h diff | blob | history
resource/include/OCPlatform_impl.h diff | blob | history
resource/src/InProcClientWrapper.cpp diff | blob | history
resource/src/OCPlatform.cpp diff | blob | history
service/protocol-plugin/sample-app/linux/SConscript diff | blob | history
service/soft-sensor-manager/SConscript diff | blob | history
service/things-manager/Readme.txt [new file with mode: 0755] blob
Domain: Network & Connectivity / IoT Connectivity;