Merge "Added GetUniformName to Sampler." into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)
commit8f13443325beb077ebd66886863efafce4df175e
treeb032e11421ec1103a18e183a6ef2e46bf4d4a71b
parent6ec96627aaea80d007f041d0fb5dac7171681e9f
parent879f080433b3428e90ed19ed3c7287a98c9158d6
Merge "Added GetUniformName to Sampler." into devel/master
dali/internal/event/rendering/sampler-impl.cpp
dali/internal/event/rendering/sampler-impl.h