projects
/
contrib
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
945944c
f10e37b
)
Merge branch 'master' into cloud-interface
author
Jee Hyeok Kim
<jihyeok13.kim@samsung.com>
Tue, 19 Jul 2016 08:46:37 +0000
(17:46 +0900)
committer
Jee Hyeok Kim
<jihyeok13.kim@samsung.com>
Tue, 19 Jul 2016 08:48:10 +0000
(17:48 +0900)
Change-Id: I6c9ce353f30bfa10b438a5eb30bfa854af0ff267
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Trivial merge