Merge branch 'tizen' into devel/new_mesh 91/37591/3
authorDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 14:44:46 +0000 (15:44 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 16:03:32 +0000 (17:03 +0100)
commit2ec164cd618f93ccafe17b1d0b8ff16401ed4aef
treefb9258c4848427f5ef5acb560f39c6e7293accf9
parentac2e82e276fadecf2b202dd4841d0d497aca1df7
parent7f336e4318945301ac6ecc5bcb19bdb3eb120be1
Merge branch 'tizen' into devel/new_mesh

Change-Id: I1df97f4ad515536413b587eb178a5645c31dbf3a
15 files changed:
build/tizen/configure.ac
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/builder/builder-impl.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.h
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/file.list
dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp