projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f912470 3ffe726)
Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Tue, 26 Apr 2016 22:53:25 +0000 (15:53 -0700)
committerDavid Antler <david.a.antler@intel.com>
Tue, 26 Apr 2016 22:53:25 +0000 (15:53 -0700)
Change-Id: I65de4e8c13f736abe49948a042448d8261f47753
Signed-off-by: David Antler <david.a.antler@intel.com>

Trivial merge
Domain: SCM / Uncategorized;