Merge branch '12-shader-executor-constants' into '12-shader-executor'
authorPeter Gal <pgal.u-szeged@partner.samsung.com>
Mon, 14 Dec 2015 15:58:55 +0000 (10:58 -0500)
committerPeter Gal <pgal.u-szeged@partner.samsung.com>
Mon, 14 Dec 2015 16:16:55 +0000 (17:16 +0100)
See merge request !92


Trivial merge