Merge "Implement scroll bar in the TextEditor" into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)

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

Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 15 Mar 2017 14:35:27 +0000 (07:35 -0700)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history