diff options
| author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
| commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
| tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /assets/descriptor.json | |
| parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
| parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
| download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz | |
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 6 |
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", |