Merge "Applyed text padding to TextLabel, Field, Editor" into devel/master

author Jinho, Lee <jeano.lee@samsung.com>

Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)

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

Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)
author Jinho, Lee <jeano.lee@samsung.com>
Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
Simple merge
diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge
author	Jinho, Lee <jeano.lee@samsung.com>
	Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history