Merge branch 'devel/master' into devel/graphics 23/258323/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:40:27 +0000 (12:40 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:40:27 +0000 (12:40 +0100)
commit5cbf81cd770dcf0d317c7398daac2693a685cf65
treea232098ebd42bca2bf37d16b794e8c129b928344
parent6c306aa77524f3ae00d6a1f712ddc0b357ae2e66
parentcecc60765148d00181649d42726b0ac3e7c1d79d
Merge branch 'devel/master' into devel/graphics

Change-Id: I53e6732c9c6b37a457cf27697fa3ccea37714915
automated-tests/src/dali/utc-Dali-Actor.cpp
dali/internal/common/core-impl.cpp
dali/internal/render/renderers/render-renderer.cpp