Merge "[4.0] Support software styling" into tizen_4.0

author minho.sun <minho.sun@samsung.com>

Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)

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

Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)
author minho.sun <minho.sun@samsung.com>
Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)
diff --cc text/dali/internal/text-abstraction/font-client-impl.cpp
Simple merge
diff --cc text/dali/internal/text-abstraction/font-client-impl.h
Simple merge
diff --cc text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
Simple merge
diff --cc text/dali/internal/text-abstraction/font-client-plugin-impl.h
Simple merge
author	minho.sun <minho.sun@samsung.com>
	Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 10 Aug 2018 02:19:37 +0000 (02:19 +0000)
		1	2
text/dali/internal/text-abstraction/font-client-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
text/dali/internal/text-abstraction/font-client-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
text/dali/internal/text-abstraction/font-client-plugin-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
text/dali/internal/text-abstraction/font-client-plugin-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history