Merge "TextController - Update the text model." into devel/master

author Paul Wisbey <p.wisbey@samsung.com>

Thu, 21 Apr 2016 14:59:26 +0000 (07:59 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 21 Apr 2016 14:59:27 +0000 (07:59 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Thu, 21 Apr 2016 14:59:26 +0000 (07:59 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 21 Apr 2016 14:59:27 +0000 (07:59 -0700)
diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Thu, 21 Apr 2016 14:59:26 +0000 (07:59 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 21 Apr 2016 14:59:27 +0000 (07:59 -0700)
		1	2
dali-toolkit/internal/text/layouts/layout-engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history