projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8a8681a
01549f6
)
Merge branch 'master' into simulator
author
Harish Kumara Marappa
<h.marappa@samsung.com>
Mon, 12 Oct 2015 15:36:08 +0000
(21:06 +0530)
committer
Harish Kumara Marappa
<h.marappa@samsung.com>
Mon, 12 Oct 2015 16:33:13 +0000
(22:03 +0530)
Conflicts:
build_common/SConscript
service/SConscript
Change-Id: Ib11d0f1e0c9b0daf177ea055db77108d4bd01f4c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Trivial merge