Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 0 insertions, 30 deletions

diff --git a/js/helper-classes/backup-delete/GLLight.js b/js/helper-classes/backup-delete/GLLight.js
deleted file mode 100755
index 2bd5f77e..00000000
--- a/js/helper-classes/backup-delete/GLLight.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* <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
-    ///////////////////////////////////////////////////////////////////////
-
-}
-
-