aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:00:19 -0700
committerArmen Kesablyan2012-06-20 15:00:19 -0700
commit120e31dcf1e11eed11ee430d77c438e7b073e9f8 (patch)
tree8c07b1203de42f6efdeebfc8663072fffb4a567b /assets/descriptor.json
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
parent52833c3d8a485944c42acc6ac0ae5139b3427da8 (diff)
downloadninja-120e31dcf1e11eed11ee430d77c438e7b073e9f8.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r--assets/descriptor.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 85fbc996..2873205f 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -24,6 +24,7 @@
24 "images/paris.png", 24 "images/paris.png",
25 "images/powderblue.png", 25 "images/powderblue.png",
26 "images/raiders.png", 26 "images/raiders.png",
27 "images/us_flag.png",
27 "shaders/Basic.frag.glsl", 28 "shaders/Basic.frag.glsl",
28 "shaders/TwistVert.vert.glsl", 29 "shaders/TwistVert.vert.glsl",
29 "shaders/Basic.vert.glsl", 30 "shaders/Basic.vert.glsl",
@@ -31,6 +32,7 @@
31 "shaders/Deform.frag.glsl", 32 "shaders/Deform.frag.glsl",
32 "shaders/Water2.frag.glsl", 33 "shaders/Water2.frag.glsl",
33 "shaders/Flag.vert.glsl", 34 "shaders/Flag.vert.glsl",
35 "shaders/Flag.frag.glsl",
34 "shaders/ZInvert.frag.glsl", 36 "shaders/ZInvert.frag.glsl",
35 "shaders/Fly.frag.glsl", 37 "shaders/Fly.frag.glsl",
36 "shaders/linearGradient.frag.glsl", 38 "shaders/linearGradient.frag.glsl",