projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ba9b00 40e5426)
Merge "[CA-Integration] Added connectivity type param in APIs" into connectivity...
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 00:15:29 +0000 (00:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 00:15:29 +0000 (00:15 +0000)
1  2 
resource/csdk/stack/src/ocstack.c patch | diff1 | diff2 | blob | history

diff --cc resource/csdk/stack/src/ocstack.c
Simple merge
Domain: Network & Connectivity / IoT Connectivity;