Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 20 Mar 2017 11:37:18 +0000 (11:37 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 20 Mar 2017 11:37:18 +0000 (11:37 +0000)
commit077807c1afeaea88e65291c62f6ac91c6054a047
tree22927528772fb0cac1c662969cbf4e366671822e
parent067889824ff6e68ea8668f0798bd552a25555566
parent5d2e92f0682a88ffccc0eb30699e86e680611628
Merge branch 'devel/master' into devel/vulkan
dali/internal/update/manager/update-manager.cpp