Merge branch 'devel/master' into devel/graphics 93/258793/2
authorDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:25:37 +0000 (00:25 +0100)
committerDavid Steele <david.steele@samsung.com>
Wed, 26 May 2021 10:43:35 +0000 (11:43 +0100)
commit716d916ef3929bbf21238c341f83817354386c22
treec6f0b623ebb046fdddda87be09f1a6e0913ea047
parent4f0ede80df126cfec14cc4a8994924542b9c3f29
parent0851912ab7b5f6685893d971add6730b7cd44b31
Merge branch 'devel/master' into devel/graphics

Change-Id: Ia4b90e49af7ce16a94a245c83677522cfb728aa5
automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
dali/integration-api/scene.cpp
dali/integration-api/scene.h
dali/internal/event/common/scene-impl.cpp
dali/internal/event/common/scene-impl.h