projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b866038
a7316ee
)
Merge branch 'master' into windows-port
author
David Antler
<david.a.antler@intel.com>
Wed, 27 Apr 2016 21:30:57 +0000
(14:30 -0700)
committer
David Antler
<david.a.antler@intel.com>
Wed, 27 Apr 2016 21:30:57 +0000
(14:30 -0700)
Change-Id: Ia553668db05e19ade5afa2b42b7e42632cae4cba
Signed-off-by: David Antler <david.a.antler@intel.com>
Trivial merge