Merge "Changed Toolkit shader effects to be a static function returning a Dali::Shade...
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 3 Jun 2015 15:08:39 +0000 (08:08 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 3 Jun 2015 15:08:39 +0000 (08:08 -0700)
commitda0b26956ee6258765ff541e1b8057557a37144b
tree8fcfd2a4d9abbd717a1ddfe14326aa0092fcf5c6
parentbb3974d91de40b4af405063d4b1cb58fd48530ba
parent4eb683ee97fc0d8a7278b50252a467b843f869df
Merge "Changed Toolkit shader effects to be a static function returning a Dali::ShaderEffect instead of inheriting directly from ShaderEffect" into devel/new_mesh