Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/preloader/Preloader.js

1 files changed, 30 insertions, 0 deletions

diff --git a/js/helper-classes/backup-delete/GLLight.js b/js/helper-classes/backup-delete/GLLight.js
new file mode 100755
index 00000000..2bd5f77e
--- /dev/null
+++ b/js/helper-classes/backup-delete/GLLight.js
@@ -0,0 +1,30 @@
+/* <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> */
+
+///////////////////////////////////////////////////////////////////////
+// Class GLMaterial
+//      GL representation of a material.
+///////////////////////////////////////////////////////////////////////
+function GLLight()
+{
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._type = 0;
+        this._color = [0.1, 0.1, 0.1, 1];
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+
+    
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+
+}
+
+