Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 15:56:35 +0000 (16:56 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 15:56:35 +0000 (16:56 +0100)
commit667ceb332935f1bc171e398c5f3ac908d00ace56
tree7886444e7f07fc4fc6cbb31af9515e7505836e00
parentad97612446cca541578f8282ce512c07c9b8fd14
parent198c199bbd9d751eddd478c4fbf39b864c25c0b6
Merge branch 'devel/master' into devel/vulkan
build/tizen/configure.ac
dali/internal/update/manager/update-manager.cpp