Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/assets/shaders/Taper.frag.glsl b/assets/shaders/Taper.frag.glsl
new file mode 100644
index 00000000..3a5766fb
--- /dev/null
+++ b/assets/shaders/Taper.frag.glsl
@@ -0,0 +1,17 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+//uniform vec4 color;
+varying vec4 v_color;
+
+void main() {
+    gl_FragColor = v_color;
+}