Merge branch 'devel/master' into devel/graphics 28/258328/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 12:01:21 +0000 (13:01 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 14:57:06 +0000 (15:57 +0100)
commit9161d9828d1a5bb3c7eaf83002863de84b23b751
treef6d1448a076e076faf6f132425898a3929f9b012
parent68d3700c2fe64a0f09c654840672f6d93ae8f35f
parentf5b1adbd0137dbd4a753be628c736f89a9ae685f
Merge branch 'devel/master' into devel/graphics

Change-Id: Ie1526bf82b84f25cf1cfbd1ccf77d2033bd38190
automated-tests/src/dali-scene-loader/CMakeLists.txt
automated-tests/src/dali-shader-generator/CMakeLists.txt
automated-tests/src/dali-toolkit-internal/CMakeLists.txt