Merge branch 'devel/master' into devel/graphics 58/253558/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 15 Feb 2021 13:19:02 +0000 (13:19 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 15 Feb 2021 13:19:08 +0000 (13:19 +0000)
commitf986ef9916cccb25c8c8558111e0629de4b5f931
tree934af2cb5ba1c751c30fe0d132892c0ba4e09639
parent4ee22b9001dc39d1c173d8c50d679a176d40a5e8
parent1d2ad8fedd414cfd3947e895f9a23866189c6dc1
Merge branch 'devel/master' into devel/graphics

Change-Id: I9830e8fe51829e833e04e152cdfc5c661e09a924
automated-tests/src/dali/utc-Dali-Animation.cpp
dali/devel-api/animation/key-frames-devel.cpp
dali/internal/render/common/render-manager.cpp
dali/internal/render/renderers/render-renderer.cpp
dali/internal/render/renderers/render-renderer.h