projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 135d8f0 45d140a)
Merge "Implemented JSON Serialization using Cereal Library"
authorsudarshan prasad <sudarshan.prasad@intel.com>
Tue, 2 Dec 2014 23:23:46 +0000 (15:23 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Tue, 2 Dec 2014 23:23:46 +0000 (15:23 -0800)
1  2 
resource/src/OCResource.cpp patch | diff1 | diff2 | blob | history

diff --cc resource/src/OCResource.cpp
Simple merge
Domain: SCM / Uncategorized;