Merge "Fix PageFactory to take in Texture rather than Image" into devel/master

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

Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)

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

Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)
diff --cc dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)