Merge changes Ia2ec4b45,Ied29583a into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 22 Nov 2016 16:04:04 +0000 (08:04 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 22 Nov 2016 16:04:04 +0000 (08:04 -0800)
commitee431c9e2b342243f9e0e2b6bafca7505d321457
tree863006f781a1e08881ad5cce478282973df2b01c
parentbaeb5ad3a0b2b1535c48dfb25f3d7ace66cde857
parent09ae840a22681a4bbdc770f00674498ab75aec69
Merge changes Ia2ec4b45,Ied29583a into devel/master

* changes:
  Text - First Page Renderer implementation.
  ModelView implementation.
dali-toolkit/internal/text/text-controller.cpp