diff options
| author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
| commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
| tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /assets/descriptor.json | |
| parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 2 |
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", |