Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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 @@
 {
-        "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"}],
@@ -29,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"
         ]