Merge "Lines added to the model." into new_text

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

Tue, 10 Mar 2015 13:46:34 +0000 (06:46 -0700)

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

Tue, 10 Mar 2015 13:46:35 +0000 (06:46 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Tue, 10 Mar 2015 13:46:34 +0000 (06:46 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 10 Mar 2015 13:46:35 +0000 (06:46 -0700)
diff --cc dali-toolkit/internal/text/visual-model.cpp
Simple merge
diff --cc dali-toolkit/internal/text/visual-model.h
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 10 Mar 2015 13:46:34 +0000 (06:46 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 10 Mar 2015 13:46:35 +0000 (06:46 -0700)
		1	2
dali-toolkit/internal/text/visual-model.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/visual-model.h	patch \|	diff1 \|	diff2 \|	blob \| history