From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 14 Mar 2012 08:59:17 -0700
Subject: Squashed commit of the following:

merge master into timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 assets/descriptor.json | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index ef21b8b8..af0520dd 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -4,32 +4,55 @@
 	"root": "/assets/",
 	"directories": [{"name": "images"}, {"name": "shaders"}],
 	"files": [
+		"canvas-runtime.js",
 		"rdge-compiled.js",
-		"images/black.png",
-		"images/blue.png",
 		"images/BoxB2_AO.png",
-		"images/BoxB2_DM.png",
-		"images/cubelight.png",
 		"images/grey.png",
-		"images/material_paint.png",
-		"images/metal.png",
-		"images/normalMap.png",
-		"images/random_normal.png",
 		"images/rocky-diffuse.jpg",
+		"images/BoxB2_DM.png",
+		"images/material_paint.png",
 		"images/rocky-normal.jpg",
+		"images/black.png",
+		"images/metal.png",
 		"images/rocky-spec.jpg",
+		"images/blue.png",
+		"images/normalMap.png",
 		"images/silver.png",
+		"images/cubelight.png",
+		"images/random_normal.png",
 		"images/white.png",
 		"shaders/Basic.frag.glsl",
+		"shaders/TwistVert.vert.glsl",
 		"shaders/Basic.vert.glsl",
+		"shaders/Water.frag.glsl",
+		"shaders/Deform.frag.glsl",
+		"shaders/Water2.frag.glsl",
+		"shaders/Flag.vert.glsl",
+		"shaders/ZInvert.frag.glsl",
+		"shaders/Fly.frag.glsl",
 		"shaders/linearGradient.frag.glsl",
+		"shaders/Julia.frag.glsl",
 		"shaders/linearGradient.vert.glsl",
+		"shaders/Keleidoscope.frag.glsl",
+		"shaders/plasma.frag.glsl",
+		"shaders/Mandel.frag.glsl",
+		"shaders/plasma.vert.glsl",
+		"shaders/Pulse.frag.glsl",
+		"shaders/radialBlur.frag.glsl",
+		"shaders/ReliefTunnel.frag.glsl",
 		"shaders/radialGradient.frag.glsl",
+		"shaders/SquareTunnel.frag.glsl",
 		"shaders/radialGradient.vert.glsl",
+		"shaders/Star.frag.glsl",
 		"shaders/test_fshader.glsl",
+		"shaders/Taper.frag.glsl",
 		"shaders/test_fshader_full.glsl",
+		"shaders/Taper.vert.glsl",
 		"shaders/test_vshader.glsl",
+		"shaders/Tunnel.frag.glsl",
 		"shaders/ub_fshader.glsl",
-		"shaders/ub_vshader.glsl"
+		"shaders/Twist.frag.glsl",
+		"shaders/ub_vshader.glsl",
+		"shaders/TwistVert.frag.glsl"
 	]
 }
\ No newline at end of file
-- 
cgit v1.2.3