From: Paul Wisbey
Date: Wed, 7 Jan 2015 10:12:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F33257%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Relayout-Utilities.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp
Change-Id: I03204cfe486d6b861d970676b9db41749c6236eb
---
24b3e26d147f772b0396937442484ff75b327aa7