projects / contrib / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 83cce9e f10e37b)
Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Mon, 18 Jul 2016 05:12:02 +0000 (14:12 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Mon, 18 Jul 2016 05:15:13 +0000 (14:15 +0900)
commit90f488430cd0e99018ec1196b7d030ea887b79f0
treea4b46be775251cd6e3f714ca007b2cf8c0ff5c6etree | snapshot
parent83cce9ed0ab42d4c4968e00ad7ad9b795620725ecommit | diff
parentf10e37bba046abe4b111b2c429fc0889be46f1d3commit | diff
Merge branch 'master' into notification-service

Add recent changes of master branch into notification-service
Exclude notification service from build,
because CA changes need to be applied both of provider and consumer.
It will be changed in next commit

Change-Id: Id9bb9391c648b76d811034b896a933f42de89328
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
service/SConscript diff1 | diff2 | blob | history
Domain: SCM / Uncategorized;