projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4fedac 073e992)
Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Wed, 24 Jun 2015 07:34:16 +0000 (16:34 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Wed, 24 Jun 2015 07:34:32 +0000 (16:34 +0900)
Update the last changes of 'master' into 'resource-manipulation' branch

Change-Id: I1ddfc5d14ea01a46e52f1e6d5efe73732225d67d
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>

Trivial merge
Domain: SCM / Uncategorized;