projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 529d886 f426c86)
Merge "Merge Resource Directory into the master" into 1.0.0-dev 1.0.0-RC2
authorUze Choi <uzchoi@samsung.com>
Thu, 1 Oct 2015 11:37:23 +0000 (11:37 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 1 Oct 2015 11:37:23 +0000 (11:37 +0000)
1  2 
resource/csdk/stack/src/ocresource.c patch | diff1 | diff2 | blob | history

diff --cc resource/csdk/stack/src/ocresource.c
Simple merge
Domain: SCM / Uncategorized;