Merge "TextController - Update the text model." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 21 Apr 2016 14:59:26 +0000 (07:59 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 21 Apr 2016 14:59:27 +0000 (07:59 -0700)
commit9598e692217c5fb541d862a3957b3efd5fd5171d
treee74905a46a50c13844e461663c880096aad08334
parent008e8f30624bc5abdfc707fdafd31b0540fa53d0
parent26cacf71e74fab984c12bc77485920f4573b97ec
Merge "TextController - Update the text model." into devel/master
dali-toolkit/internal/text/layouts/layout-engine.cpp
dali-toolkit/internal/text/text-controller-impl.cpp