From: Adeel Kazmi Date: Mon, 14 Jan 2019 10:40:50 +0000 (+0000) Subject: Merge "Enum properties added for the text effects style." into devel/master X-Git-Tag: dali_1.4.3~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1b032e3f72c144d2da593a1c20d15041a3de00a3;hp=-c Merge "Enum properties added for the text effects style." into devel/master --- 1b032e3f72c144d2da593a1c20d15041a3de00a3 diff --combined dali-toolkit/devel-api/file.list index 9fe075e,ef91d3a..115156e --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@@ -132,7 -132,6 +132,7 @@@ devel_api_visuals_header_files = $(devel_api_src_dir)/visuals/animated-gradient-visual-properties-devel.h \ $(devel_api_src_dir)/visuals/animated-image-visual-actions-devel.h \ $(devel_api_src_dir)/visuals/animated-vector-image-visual-actions-devel.h \ + $(devel_api_src_dir)/visuals/animated-vector-image-visual-signals-devel.h \ $(devel_api_src_dir)/visuals/color-visual-properties-devel.h \ $(devel_api_src_dir)/visuals/image-visual-properties-devel.h \ $(devel_api_src_dir)/visuals/image-visual-actions-devel.h \ @@@ -178,7 -177,8 +178,8 @@@ devel_api_text_controls_header_files = $(devel_api_src_dir)/controls/text-controls/text-field-devel.h \ $(devel_api_src_dir)/controls/text-controls/text-label-devel.h \ $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h \ - $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h + $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h \ + $(devel_api_src_dir)/controls/text-controls/text-style-properties-devel.h devel_api_text_header_files = \ $(devel_api_src_dir)/text/text-enumerations-devel.h