projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b58560a 8bbdd4b)
Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Sun, 12 Jul 2015 03:35:30 +0000 (12:35 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Sun, 12 Jul 2015 03:35:43 +0000 (12:35 +0900)
commit1a4ae4967c14b35372065952860c7363ee09e861
tree96a11dc8ce3b002e3d327be2ae984e90c3370199tree | snapshot
parentb58560a0cba36152569518ee3eb24a42d5599021commit | diff
parent8bbdd4b071d8c061f436b1c67e267ba82c10e612commit | diff
Merge branch 'master' into resource-manipulation

Apply the resece updates from 'master' branch into 'resource-manipulation' branch
This update includes the fix of current 'presence' issues.

Change-Id: I4417164bd31285e80d9dd4b655e6f828ee1b6fe0
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Domain: Network & Connectivity / IoT Connectivity;