Merge branch 'new_text' into tizen 26/38026/2
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 15:51:36 +0000 (16:51 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 9 Apr 2015 17:53:24 +0000 (18:53 +0100)
commit1bd34fb576e5ba31a01aae4313e40e4ca94b3efa
treefb871c219a65c1817f666c7a18a2fa29c40dbfcf
parent35d4892c7a1f70d525faefb7e92610711baad686
parent5f9a06a1957e64365f9afea76ea4add885a1c841
Merge branch 'new_text' into tizen

Change-Id: I4084c10fec73a78eb03b2b1e25d8ca09479c1061
text/dali/internal/text-abstraction/font-client-plugin-impl.cpp