projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7998e09 b98b92c)
Merge "[CA-Integration] fix for presence." into connectivity-abstraction
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Wed, 24 Dec 2014 01:24:12 +0000 (01:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 24 Dec 2014 01:24:12 +0000 (01:24 +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: SCM / Uncategorized;