Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

author Kimmo Hoikka <kimmo.hoikka@samsung.com>

Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)

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

Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)
diff --cc dali-toolkit/internal/controls/slider/slider-impl.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)