Merge branch 'devel/master' into devel/graphics 94/258794/2
authorDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:27:07 +0000 (00:27 +0100)
committerDavid Steele <david.steele@samsung.com>
Wed, 26 May 2021 10:34:43 +0000 (11:34 +0100)
commit4196aa2061de354373c78a29a2dbaae3ab0099e6
tree4c44f717a2e1c47ec8798ec0644534715591ce36
parent978ae126bac155b190ad6e0ff6bad189f9ec2ef3
parent2bfbfdaef6efd6a4342587ba09d25a2c92153195
Merge branch 'devel/master' into devel/graphics

Change-Id: I074c2bb0fbb1d6775cfbadcf4f1271e177bc12c2
dali/devel-api/adaptor-framework/accessibility-impl.cpp
dali/internal/accessibility/bridge/bridge-base.h
dali/internal/accessibility/bridge/bridge-impl.cpp
dali/internal/accessibility/bridge/dummy-atspi.cpp
dali/internal/imaging/common/image-loader.cpp
dali/internal/window-system/common/window-render-surface.cpp