From: HyunJu Shin <hyunjushin@samsung.com>
Date: Mon, 25 Sep 2017 06:59:26 +0000 (+0000)
Subject: Merge "Add Placeholder Ellipsis in TextField" into devel/master
X-Git-Tag: dali_1.2.59~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6bc33c55ece7fc30d8229f35e6e9f8b807a9a437

Merge "Add Placeholder Ellipsis in TextField" into devel/master
---

6bc33c55ece7fc30d8229f35e6e9f8b807a9a437
diff --cc dali-toolkit/internal/text/text-controller.cpp
index 482cfc3,4ca2d9a..4cc9d90
mode 100755,100644..100755
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
diff --cc dali-toolkit/internal/text/text-controller.h
index 3d0eb6c,609fe7a..b02bb68
mode 100755,100644..100755
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h