aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-10 11:17:45 -0700
committerJose Antonio Marquez2012-07-10 11:17:45 -0700
commit7d42a17a67eaec57e78f5fa730c1481515904a44 (patch)
tree738f5c0bde04ce175766db302922c6a3d70882fe /assets/descriptor.json
parentcdaf0fdf64ddc12cacdc58c357053ff4652b7f46 (diff)
parent2f81cac4e10f9f4e4b44b6186de0d3d831d75bc4 (diff)
downloadninja-7d42a17a67eaec57e78f5fa730c1481515904a44.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Color
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r--assets/descriptor.json12
1 files changed, 0 insertions, 12 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2cd21830..d9d74e6b 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -28,35 +28,23 @@
28 "shaders/TwistVert.vert.glsl", 28 "shaders/TwistVert.vert.glsl",
29 "shaders/Basic.vert.glsl", 29 "shaders/Basic.vert.glsl",
30 "shaders/Water.frag.glsl", 30 "shaders/Water.frag.glsl",
31 "shaders/Deform.frag.glsl",
32 "shaders/Water2.frag.glsl", 31 "shaders/Water2.frag.glsl",
33 "shaders/Flag.vert.glsl", 32 "shaders/Flag.vert.glsl",
34 "shaders/Flag.frag.glsl", 33 "shaders/Flag.frag.glsl",
35 "shaders/ZInvert.frag.glsl",
36 "shaders/Fly.frag.glsl",
37 "shaders/linearGradient.frag.glsl", 34 "shaders/linearGradient.frag.glsl",
38 "shaders/Julia.frag.glsl",
39 "shaders/linearGradient.vert.glsl", 35 "shaders/linearGradient.vert.glsl",
40 "shaders/Keleidoscope.frag.glsl",
41 "shaders/plasma.frag.glsl", 36 "shaders/plasma.frag.glsl",
42 "shaders/Mandel.frag.glsl",
43 "shaders/Paris.frag.glsl", 37 "shaders/Paris.frag.glsl",
44 "shaders/plasma.vert.glsl", 38 "shaders/plasma.vert.glsl",
45 "shaders/Pulse.frag.glsl", 39 "shaders/Pulse.frag.glsl",
46 "shaders/radialBlur.frag.glsl",
47 "shaders/ReliefTunnel.frag.glsl",
48 "shaders/radialGradient.frag.glsl", 40 "shaders/radialGradient.frag.glsl",
49 "shaders/SquareTunnel.frag.glsl",
50 "shaders/radialGradient.vert.glsl", 41 "shaders/radialGradient.vert.glsl",
51 "shaders/Star.frag.glsl",
52 "shaders/test_fshader.glsl", 42 "shaders/test_fshader.glsl",
53 "shaders/Taper.frag.glsl", 43 "shaders/Taper.frag.glsl",
54 "shaders/test_fshader_full.glsl", 44 "shaders/test_fshader_full.glsl",
55 "shaders/Taper.vert.glsl", 45 "shaders/Taper.vert.glsl",
56 "shaders/test_vshader.glsl", 46 "shaders/test_vshader.glsl",
57 "shaders/Tunnel.frag.glsl",
58 "shaders/ub_fshader.glsl", 47 "shaders/ub_fshader.glsl",
59 "shaders/Twist.frag.glsl",
60 "shaders/ub_vshader.glsl", 48 "shaders/ub_vshader.glsl",
61 "shaders/TwistVert.frag.glsl" 49 "shaders/TwistVert.frag.glsl"
62 ] 50 ]