Merge branch 'devel/master' into devel/graphics 25/256025/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:52 +0000 (16:22 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:52 +0000 (16:22 +0000)
commit416fe5a5deeb51844089bfc9d6055e8852909f97
tree3e53f35877babb8d4987f0c638f8da4801d81986
parent7a7f3a4b7c77fbbfd269b9c9dba36dd47e2e1507
parent0175537c8f0ff2e10f99e666c481cf0e628d0fcf
Merge branch 'devel/master' into devel/graphics

Change-Id: I1c4d2148118bf84173c014185deb423f0df2916e
automated-tests/src/dali-toolkit/CMakeLists.txt