Merge "Fixed testcases using sampler uniforms" into devel/master

author Paul Wisbey <p.wisbey@samsung.com>

Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)

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

Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)