From 29c99f4ffd13f06cddf8952adab252d15ee35a6a Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 9 Jul 2012 17:45:17 -0700
Subject: cleaned up remaining copyrights for release

---
 assets/descriptor.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2873205f..2cd21830 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -1,5 +1,4 @@
 {
-	"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.",
 	"version": "0.0.0.0",
 	"root": "/assets/",
 	"directories": [{"name": "images"}, {"name": "shaders"}],
-- 
cgit v1.2.3


From d6613f1e883eaa318fcf2098477eb5eede3d34ba Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 10 Jul 2012 10:00:35 -0700
Subject: Removed the shaders that we do not have rights to.

---
 assets/descriptor.json | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2cd21830..d9d74e6b 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -28,35 +28,23 @@
 		"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/Flag.frag.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/Paris.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/Twist.frag.glsl",
 		"shaders/ub_vshader.glsl",
 		"shaders/TwistVert.frag.glsl"
 	]
-- 
cgit v1.2.3