From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 21 Oct 2016 10:34:10 +0000 (-0700)
Subject: Merge "Added code for stylable transitions" into devel/master
X-Git-Tag: dali_1.2.12~21
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45

Merge "Added code for stylable transitions" into devel/master
---

f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45
diff --cc dali-toolkit/internal/file.list
index 7514ea5,8437cef..57b4dbf
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/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 \