Merge remote-tracking branch 'gerrithub/devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 6 Jun 2017 12:12:14 +0000 (13:12 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 6 Jun 2017 12:12:14 +0000 (13:12 +0100)
commit23252c7479e8fa1cdd143a5f6933ec27bb1d9e8b
tree7886444e7f07fc4fc6cbb31af9515e7505836e00
parentad97612446cca541578f8282ce512c07c9b8fd14
parent198c199bbd9d751eddd478c4fbf39b864c25c0b6
Merge remote-tracking branch 'gerrithub/devel/master' into devel/vulkan
build/tizen/configure.ac
dali/internal/update/manager/update-manager.cpp