Merge "Doxygen grouping" into devel/master

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

Fri, 4 Sep 2015 10:04:40 +0000 (03:04 -0700)

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

Fri, 4 Sep 2015 10:04:41 +0000 (03:04 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Sep 2015 10:04:40 +0000 (03:04 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 4 Sep 2015 10:04:41 +0000 (03:04 -0700)
diff --cc dali-toolkit/public-api/controls/text-controls/text-field.h
Simple merge
diff --cc dali-toolkit/public-api/controls/text-controls/text-label.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Fri, 4 Sep 2015 10:04:40 +0000 (03:04 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 4 Sep 2015 10:04:41 +0000 (03:04 -0700)
		1	2
dali-toolkit/public-api/controls/text-controls/text-field.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/text-controls/text-label.h	patch \|	diff1 \|	diff2 \|	blob \| history