Merge "Added GetUniformName to Sampler." into devel/master

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

Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)

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

Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
diff --cc dali/internal/event/rendering/sampler-impl.cpp
Simple merge
diff --cc dali/internal/event/rendering/sampler-impl.h
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
		1	2
dali/internal/event/rendering/sampler-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/event/rendering/sampler-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history