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

author HyunJu Shin <hyunjushin@samsung.com>

Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)
author HyunJu Shin <hyunjushin@samsung.com>
Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller.cpp

index 482cfc3,4ca2d9a..4cc9d90

mode 100755,100644..100755
--- 1/dali-toolkit/internal/text/text-controller.cpp
--- 2/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
--- 1/dali-toolkit/internal/text/text-controller.h
--- 2/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
author	HyunJu Shin <hyunjushin@samsung.com>
	Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 25 Sep 2017 06:59:26 +0000 (06:59 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.h	patch \|	diff1 \|	diff2 \|	blob \| history