Merge branch 'devel/master' into devel/vulkan

Change-Id: Ife614c2b1fba903974538bfa3f9d28f2ff4fc628

diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
index e3df75e,46dbc2f..e82090c
mode 100644,100755..100755
--- 1/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
--- 2/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp

diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
index ebe5542,74d3358..12d6f5e
mode 100644,100755..100755
--- 1/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
--- 2/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp

diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
Simple merge

diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
Simple merge

diff --cc dali-toolkit/devel-api/file.list
index 9886881,25be5fa..35a3b77
--- 1/dali-toolkit/devel-api/file.list
--- 2/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -46,13 -46,9 +46,15 @@@ devel_api_src_files = 
    $(devel_api_src_dir)/layouting/linear-layout.cpp \
    $(devel_api_src_dir)/layouting/layout-transition-data.cpp \
    $(devel_api_src_dir)/scripting/script.cpp \
 +  $(devel_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
 +  $(devel_api_src_dir)/shader-effects/dissolve-effect.cpp \
 +  $(devel_api_src_dir)/shader-effects/distance-field-effect.cpp \
 +  $(devel_api_src_dir)/shader-effects/image-region-effect.cpp \
 +  $(devel_api_src_dir)/shader-effects/motion-blur-effect.cpp \
 +  $(devel_api_src_dir)/shader-effects/motion-stretch-effect.cpp \
    $(devel_api_src_dir)/styling/style-manager-devel.cpp \
+   $(devel_api_src_dir)/text/bitmap-font.cpp \
+   $(devel_api_src_dir)/text/text-utils-devel.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-effect.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \

diff --cc dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h
Simple merge

diff --cc dali-toolkit/devel-api/visuals/image-visual-properties-devel.h
Simple merge

diff --cc dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
Simple merge

diff --cc dali-toolkit/internal/file.list
Simple merge

diff --cc dali-toolkit/internal/layouting/layout-controller-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
Simple merge

diff --cc dali-toolkit/internal/text/layouts/layout-parameters.h
Simple merge

diff --cc dali-toolkit/internal/text/markup-processor-helper-functions.cpp
index 282b5b8,6c133ae..49e8d09
mode 100644,100755..100755
--- 1/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
--- 2/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
+++ b/dali-toolkit/internal/text/markup-processor-helper-functions.cpp

diff --cc dali-toolkit/internal/text/markup-processor-helper-functions.h
index dd8e1e3,2b0cafb..29d26ae
mode 100644,100755..100755
--- 1/dali-toolkit/internal/text/markup-processor-helper-functions.h
--- 2/dali-toolkit/internal/text/markup-processor-helper-functions.h
+++ b/dali-toolkit/internal/text/markup-processor-helper-functions.h

diff --cc dali-toolkit/internal/text/markup-processor.cpp
Simple merge

diff --cc dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
Simple merge

diff --cc dali-toolkit/internal/visuals/image/image-visual.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/texture-manager-impl.h
Simple merge

diff --cc dali-toolkit/internal/visuals/visual-factory-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/visual-string-constants.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/visual-string-constants.h
Simple merge

diff --cc packaging/dali-toolkit.spec
index 4d2d10b,c5d488f..023b135
--- 1/packaging/dali-toolkit.spec
--- 2/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
 -Name:       dali-toolkit
 +Name:       dali-toolkit-vk
  Summary:    Dali 3D engine Toolkit
- Version:    1.4.5
+ Version:    1.4.14
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0 and BSD-3-Clause and MIT