Merge "Added code for stylable transitions" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Oct 2016 10:34:10 +0000 (03:34 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 21 Oct 2016 10:34:10 +0000 (03:34 -0700)
1  2 
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
dali-toolkit/devel-api/visual-factory/visual-base.cpp
dali-toolkit/devel-api/visual-factory/visual-base.h
dali-toolkit/internal/file.list
dali-toolkit/internal/visuals/visual-base-impl.cpp
dali-toolkit/internal/visuals/visual-base-impl.h
dali-toolkit/public-api/file.list

@@@ -29,8 -29,8 +29,9 @@@ toolkit_src_files = 
     $(toolkit_src_dir)/visuals/primitive/primitive-visual.cpp \
     $(toolkit_src_dir)/visuals/svg/svg-rasterize-thread.cpp \
     $(toolkit_src_dir)/visuals/svg/svg-visual.cpp \
 +   $(toolkit_src_dir)/visuals/text/text-visual.cpp \
     $(toolkit_src_dir)/visuals/wireframe/wireframe-visual.cpp \
+    $(toolkit_src_dir)/visuals/transition-data-impl.cpp \
     $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
     $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
     $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
Simple merge