projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6ad1113
1503c9c
)
Merge branch 'master' into resource-manipulation
author
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:20 +0000
(17:29 +0900)
committer
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:28 +0000
(17:29 +0900)
Apply recent changes of 'master' branch into 'resource-manipulation' branch
Change-Id: I201c7759d7ddbf2fd12440315968e270c360e265
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Trivial merge