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, 26 deletions

diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
deleted file mode 100644
index 7e616c40..00000000
--- a/assets/shaders/Julia.frag.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform vec2 u_resolution;
-uniform float u_time;
-uniform float u_speed;
-
-void main(void)
-{
-    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    vec2 cc = vec2( cos(.25*u_time*u_speed), sin(.25*u_time*u_speed*1.423) );
-
-    float dmin = 1000.0;
-    vec2 z  = p*vec2(1.33,1.0);
-    for( int i=0; i<64; i++ )
-    {
-        z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y );
-        float m2 = dot(z,z);
-        if( m2>100.0 ) break;
-        dmin=min(dmin,m2);
-        }
-
-    float color = sqrt(sqrt(dmin))*0.7;
-    gl_FragColor = vec4(color,color,color,1.0);
-}
\ No newline at end of file