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

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 0 insertions, 17 deletions

diff --git a/js/helper-classes/RDGE/precompiled.js b/js/helper-classes/RDGE/precompiled.js
deleted file mode 100755
index 7932444c..00000000
--- a/js/helper-classes/RDGE/precompiled.js
+++ /dev/null
@@ -1,17 +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> */
-
-/*
- *      A list of shared parameters that all shaders can support (the engine always try to bind these uniforms)
- *      These parameters are compiled into all jshaders and can be set from any jshader
- *      with a call to jshader.global.u_matDiffuse.set([1,0,0,1]) if the jshader depends on that parameter.
- *      To set directly call rdgeGlobalParameters.'param'.set(x), for example rdgeGlobalParameters.u_lightPos.set([1,1,1])
- *      The values can be added to a jshaders params list - this will creating local jshader memory that binds to the parameter
- *      this parameter can be used to set the value for that shader but will not override the global setting
- *      The values set here are the default global values.
- *      note: the rdge_lights substructure can be ignored, the final parameter list contains only the uniform objects
- */
-