projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e5b9d4 cd59314)
Merge branch 'master' of ssh://oic/oic-resource
authorErich Keane <erich.keane@intel.com>
Sat, 11 Oct 2014 20:28:22 +0000 (13:28 -0700)
committerErich Keane <erich.keane@intel.com>
Sat, 11 Oct 2014 20:28:22 +0000 (13:28 -0700)

Trivial merge
Domain: SCM / Uncategorized;