Merge "Changed RendererAttachment to use blend flag from RenderDataProvider rather...

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

Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)

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

Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)
diff --cc dali/internal/update/manager/prepare-render-algorithms.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)