Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)

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

Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc dali-toolkit/devel-api/file.list
Simple merge
diff --cc dali-toolkit/internal/visuals/text/text-visual.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/devel-api/file.list	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/visuals/text/text-visual.cpp	patch \|	diff1 \|	diff2 \|	blob \| history