Merge "Remove extension from shader." into devel/new_mesh

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

Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)

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

Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)
diff --cc automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
Simple merge
diff --cc dali/internal/event/effects/shader-effect-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)
		1	2
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/event/effects/shader-effect-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history