projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0a6018
ad47940
)
Merge branch 'master' into resource-encapsulation
author
hunje.yeon
<hunje.yeon@samsung.com>
Tue, 15 Sep 2015 11:13:28 +0000
(20:13 +0900)
committer
Hun-je Yeon
<hunje.yeon@samsung.com>
Tue, 15 Sep 2015 12:32:29 +0000
(12:32 +0000)
Update the recent changes of 15th Sep. from 'master' branch into 'resource-encapsulation'
Change-Id: I35359c7f596ce5c9d8db9a02f04835863b5a0635
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Trivial merge