projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5af6f99
e3adc78
)
Merge branch 'master' into resource-manipulation
author
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 16 Jul 2015 00:11:31 +0000
(09:11 +0900)
committer
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 16 Jul 2015 00:11:45 +0000
(09:11 +0900)
Apply latest updates from 'master' branch into 'resource-manipulation' branch
Change-Id: I2a3cce2070bf9193ca8d87261e4422f5ec8649f8
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Trivial merge