Merge "Added IGNORE_SPACES_AFTER_TEXT property" into devel/master

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

Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)

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

Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)
diff --cc automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
Simple merge
diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
Simple merge
diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 28 Aug 2018 10:40:38 +0000 (10:40 +0000)
		1	2
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/layouts/layout-engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history