diff options
| author | Kruti Shah | 2012-07-17 12:40:00 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-17 12:40:00 -0700 |
| commit | bf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch) | |
| tree | 2156d9920ea1b7db49ed6460545fea7cda121bae /assets/descriptor.json | |
| parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index 2873205f..d9d74e6b 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | { | 1 | { |
| 2 | "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.", | ||
| 3 | "version": "0.0.0.0", | 2 | "version": "0.0.0.0", |
| 4 | "root": "/assets/", | 3 | "root": "/assets/", |
| 5 | "directories": [{"name": "images"}, {"name": "shaders"}], | 4 | "directories": [{"name": "images"}, {"name": "shaders"}], |
| @@ -29,35 +28,23 @@ | |||
| 29 | "shaders/TwistVert.vert.glsl", | 28 | "shaders/TwistVert.vert.glsl", |
| 30 | "shaders/Basic.vert.glsl", | 29 | "shaders/Basic.vert.glsl", |
| 31 | "shaders/Water.frag.glsl", | 30 | "shaders/Water.frag.glsl", |
| 32 | "shaders/Deform.frag.glsl", | ||
| 33 | "shaders/Water2.frag.glsl", | 31 | "shaders/Water2.frag.glsl", |
| 34 | "shaders/Flag.vert.glsl", | 32 | "shaders/Flag.vert.glsl", |
| 35 | "shaders/Flag.frag.glsl", | 33 | "shaders/Flag.frag.glsl", |
| 36 | "shaders/ZInvert.frag.glsl", | ||
| 37 | "shaders/Fly.frag.glsl", | ||
| 38 | "shaders/linearGradient.frag.glsl", | 34 | "shaders/linearGradient.frag.glsl", |
| 39 | "shaders/Julia.frag.glsl", | ||
| 40 | "shaders/linearGradient.vert.glsl", | 35 | "shaders/linearGradient.vert.glsl", |
| 41 | "shaders/Keleidoscope.frag.glsl", | ||
| 42 | "shaders/plasma.frag.glsl", | 36 | "shaders/plasma.frag.glsl", |
| 43 | "shaders/Mandel.frag.glsl", | ||
| 44 | "shaders/Paris.frag.glsl", | 37 | "shaders/Paris.frag.glsl", |
| 45 | "shaders/plasma.vert.glsl", | 38 | "shaders/plasma.vert.glsl", |
| 46 | "shaders/Pulse.frag.glsl", | 39 | "shaders/Pulse.frag.glsl", |
| 47 | "shaders/radialBlur.frag.glsl", | ||
| 48 | "shaders/ReliefTunnel.frag.glsl", | ||
| 49 | "shaders/radialGradient.frag.glsl", | 40 | "shaders/radialGradient.frag.glsl", |
| 50 | "shaders/SquareTunnel.frag.glsl", | ||
| 51 | "shaders/radialGradient.vert.glsl", | 41 | "shaders/radialGradient.vert.glsl", |
| 52 | "shaders/Star.frag.glsl", | ||
| 53 | "shaders/test_fshader.glsl", | 42 | "shaders/test_fshader.glsl", |
| 54 | "shaders/Taper.frag.glsl", | 43 | "shaders/Taper.frag.glsl", |
| 55 | "shaders/test_fshader_full.glsl", | 44 | "shaders/test_fshader_full.glsl", |
| 56 | "shaders/Taper.vert.glsl", | 45 | "shaders/Taper.vert.glsl", |
| 57 | "shaders/test_vshader.glsl", | 46 | "shaders/test_vshader.glsl", |
| 58 | "shaders/Tunnel.frag.glsl", | ||
| 59 | "shaders/ub_fshader.glsl", | 47 | "shaders/ub_fshader.glsl", |
| 60 | "shaders/Twist.frag.glsl", | ||
| 61 | "shaders/ub_vshader.glsl", | 48 | "shaders/ub_vshader.glsl", |
| 62 | "shaders/TwistVert.frag.glsl" | 49 | "shaders/TwistVert.frag.glsl" |
| 63 | ] | 50 | ] |