projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e61ce0f daa7989)
Merge "Added support to allow more than one presence resource type filter."
authorsudarshan prasad <sudarshan.prasad@intel.com>
Mon, 8 Dec 2014 20:48:50 +0000 (12:48 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Mon, 8 Dec 2014 20:48:50 +0000 (12:48 -0800)
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;