Merge "Fixed JSON shaders. Added JSON spec to documentation"
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 May 2015 17:15:26 +0000 (10:15 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 1 May 2015 17:15:26 +0000 (10:15 -0700)

Trivial merge