Merge remote-tracking branch 'origin/tizen' into new_text 09/37109/2
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 19 Mar 2015 09:55:27 +0000 (09:55 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Thu, 19 Mar 2015 09:58:34 +0000 (09:58 +0000)
commit10d2080e1d25b75347daa2f8c2dcee494fbcb175
tree1e4cecffc463f6ceda256c43d759d9a73b2a78df
parent5a984a1705bf94f17a8ef6a05ce170d1a47e49b1
parent353751aa9ad608f8b9ab5f8c9daa679516e53554
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Builder.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-view/text-view-impl.cpp

Change-Id: Ibbbecdb2962e4f0cfce3ff0e7c91efcd8bfb2170
automated-tests/src/dali-toolkit/CMakeLists.txt
build/tizen/configure.ac
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/text/clipping/text-clipper.cpp
dali-toolkit/public-api/file.list