Merge branch 'devel/master' into devel/graphics 25/258325/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:55:55 +0000 (12:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 11:55:55 +0000 (12:55 +0100)
commit9a9ab95ca063cc2cbfddc0d249e441f8bf7845c2
tree2526a951b3e0c7ec78c753c2157c217462158956
parentd79569e9aa33b0b18cc0fde3d063e5f409131bfd
parente385c6923f3e21eb74f75a9ca45a5f421b935691
Merge branch 'devel/master' into devel/graphics

Change-Id: I1cac687307125e358fe8f5892f2189803fe1dc89
34 files changed:
automated-tests/src/dali-adaptor-internal/utc-Dali-FontClient.cpp
automated-tests/src/dali-adaptor/utc-Dali-Application.cpp
automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
dali/devel-api/adaptor-framework/atspi-accessibility.h
dali/devel-api/adaptor-framework/web-engine-context.h
dali/devel-api/adaptor-framework/web-engine-cookie-manager.h
dali/devel-api/text-abstraction/font-client.cpp
dali/devel-api/text-abstraction/font-client.h
dali/devel-api/text-abstraction/text-abstraction.h
dali/internal/accessibility/bridge/bridge-accessible.cpp
dali/internal/accessibility/bridge/bridge-base.cpp
dali/internal/accessibility/bridge/bridge-impl.cpp
dali/internal/accessibility/bridge/dummy-atspi.cpp
dali/internal/accessibility/bridge/dummy-atspi.h
dali/internal/adaptor/common/application-impl.cpp
dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
dali/internal/graphics/gles-impl/egl-graphics-controller.h
dali/internal/graphics/gles/egl-graphics.h
dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
dali/internal/system/windows/callback-manager-win.cpp
dali/internal/text/text-abstraction/font-client-impl.cpp
dali/internal/text/text-abstraction/font-client-impl.h
dali/internal/text/text-abstraction/font-client-plugin-impl.cpp
dali/internal/text/text-abstraction/font-client-plugin-impl.h
dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
dali/internal/window-system/common/gl-window-render-thread.h
dali/internal/window-system/common/window-base.cpp
dali/internal/window-system/common/window-base.h
dali/internal/window-system/common/window-render-surface.cpp
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
dali/public-api/adaptor-framework/application.cpp