Merge "Enum properties added for the text effects style." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 14 Jan 2019 10:40:50 +0000 (10:40 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 14 Jan 2019 10:40:50 +0000 (10:40 +0000)
1  2 
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