aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-19 15:59:38 -0700
committerValerio Virgillito2012-07-19 15:59:38 -0700
commitb05137f559b6445017973d550fab5e43d6f4df57 (patch)
tree6554afcb8c3b8d83d1e9bb33241e239773f396e8 /assets/descriptor.json
parentfc13ef1e806116bb7ece5bb06604fa4f5714a6ed (diff)
parent431b6fa7610e59074b4ebb3e9e712672f185b8ad (diff)
downloadninja-b05137f559b6445017973d550fab5e43d6f4df57.tar.gz
Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r--assets/descriptor.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index d9d74e6b..db824387 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -20,9 +20,9 @@
20 "images/cubelight.png", 20 "images/cubelight.png",
21 "images/random_normal.png", 21 "images/random_normal.png",
22 "images/white.png", 22 "images/white.png",
23 "images/paris.png", 23 "images/bluesky.png",
24 "images/powderblue.png", 24 "images/powderblue.png",
25 "images/raiders.png", 25 "images/darkblur.png",
26 "images/us_flag.png", 26 "images/us_flag.png",
27 "shaders/Basic.frag.glsl", 27 "shaders/Basic.frag.glsl",
28 "shaders/TwistVert.vert.glsl", 28 "shaders/TwistVert.vert.glsl",
@@ -34,9 +34,9 @@
34 "shaders/linearGradient.frag.glsl", 34 "shaders/linearGradient.frag.glsl",
35 "shaders/linearGradient.vert.glsl", 35 "shaders/linearGradient.vert.glsl",
36 "shaders/plasma.frag.glsl", 36 "shaders/plasma.frag.glsl",
37 "shaders/Paris.frag.glsl",
38 "shaders/plasma.vert.glsl", 37 "shaders/plasma.vert.glsl",
39 "shaders/Pulse.frag.glsl", 38 "shaders/Pulse.frag.glsl",
39 "shaders/radialBlur.frag.glsl",
40 "shaders/radialGradient.frag.glsl", 40 "shaders/radialGradient.frag.glsl",
41 "shaders/radialGradient.vert.glsl", 41 "shaders/radialGradient.vert.glsl",
42 "shaders/test_fshader.glsl", 42 "shaders/test_fshader.glsl",