Merge "Removed ShaderEffect" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 1 Dec 2016 17:36:40 +0000 (09:36 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 1 Dec 2016 17:36:40 +0000 (09:36 -0800)
1  2 
dali/devel-api/file.list
dali/internal/update/manager/render-instruction-processor.cpp

Simple merge