Merge branch 'devel/master' into tizen
authorSeungho, Baek <sbsh.baek@samsung.com>
Tue, 14 Jul 2020 09:38:33 +0000 (18:38 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Tue, 14 Jul 2020 09:38:33 +0000 (18:38 +0900)
commitd851ea33cbacad20913b03061b27c47bfd3d785d
treee63ea81a4cdba6c645278c70f5a6a2729ddc9063
parent83f74c1be37401972d2ce39690c5066c977b06a6
parentbc6fc32aed12359ae9976d1bc9d732d93cbceaf3
Merge branch 'devel/master' into tizen
18 files changed:
build/tizen/CMakeLists.txt
build/tizen/deps-check.cmake
dali/devel-api/file.list
dali/integration-api/adaptor-framework/render-surface-interface.h
dali/integration-api/adaptor-framework/scene-holder-impl.cpp
dali/integration-api/adaptor-framework/scene-holder-impl.h
dali/internal/window-system/common/window-base.h
dali/internal/window-system/common/window-render-surface.cpp
dali/internal/window-system/common/window-render-surface.h
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
dali/internal/window-system/windows/window-base-win.cpp
dali/internal/window-system/windows/window-base-win.h
packaging/dali-adaptor.spec