projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fdc2c7 400be3c)
Merge "Fix type conflict"
authorErich Keane <erich.keane@intel.com>
Fri, 10 Oct 2014 22:58:39 +0000 (15:58 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Fri, 10 Oct 2014 22:58:39 +0000 (15:58 -0700)

Trivial merge
Domain: SCM / Uncategorized;