Merge "FreeType fonts/library - Stop creating new instances." into devel/master

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

Tue, 7 Aug 2018 13:34:33 +0000 (13:34 +0000)

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

Tue, 7 Aug 2018 13:34:34 +0000 (13:34 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 7 Aug 2018 13:34:33 +0000 (13:34 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 7 Aug 2018 13:34:34 +0000 (13:34 +0000)
diff --cc dali/internal/text/text-abstraction/font-client-impl.cpp
Simple merge
diff --cc dali/internal/text/text-abstraction/font-client-impl.h
Simple merge
diff --cc dali/internal/text/text-abstraction/font-client-plugin-impl.cpp
Simple merge
diff --cc dali/internal/text/text-abstraction/font-client-plugin-impl.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 7 Aug 2018 13:34:33 +0000 (13:34 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 7 Aug 2018 13:34:34 +0000 (13:34 +0000)
		1	2
dali/internal/text/text-abstraction/font-client-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/text/text-abstraction/font-client-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/text/text-abstraction/font-client-plugin-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/text/text-abstraction/font-client-plugin-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history