From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 13 Mar 2015 11:01:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: dali_1.0.38~11^2~58
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3b1fb566901d21b8303d9be3308e3920f5182e6d

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	dali-toolkit/public-api/controls/text-input/text-input.h
	dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0
---

3b1fb566901d21b8303d9be3308e3920f5182e6d