Merge "Added getter for the shader in Material" into devel/new_mesh
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 9 Jun 2015 13:23:17 +0000 (06:23 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 9 Jun 2015 13:23:17 +0000 (06:23 -0700)

Trivial merge