Merge "Text - Move cursor's position related code to a different file." into devel...

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

Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)

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

Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)
diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller-impl.h
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)
		1	2
dali-toolkit/internal/text/text-controller-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history