Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri...

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

Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)

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

Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 9 Apr 2015 16:52:25 +0000 (09:52 -0700)
		1	2
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history