Merge "removal of shader inheritance, renderable actors now have shaders and there...
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 13 Aug 2014 12:37:02 +0000 (05:37 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 13 Aug 2014 12:37:02 +0000 (05:37 -0700)

Trivial merge