Merge "Scrollable public API clean-up phase 1" into tizen

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

Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)

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

Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)
diff --cc dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
Simple merge
diff --cc dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
Simple merge
diff --cc dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
Simple merge
diff --cc dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 25 Feb 2015 12:00:13 +0000 (04:00 -0800)
		1	2
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h	patch \|	diff1 \|	diff2 \|	blob \| history