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)
commit0493295d5f7c2c03b50bbbfac4fda28eee941cc7
tree63e231c83c4de4a1b7f4c9dfd667e589c2a0e58e
parent17d7f99e97a04ff3578489d351da6f212690257f
parentb03bb92346bb61f6ab5834285a53e942864b49ba
Merge "Added getter for the shader in Material" into devel/new_mesh