Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 058c6dbc..73164013 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -28,14 +28,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =                 require("montage/ui/component").Component,
-    snapManager =               require("js/helper-classes/3D/snap-manager").SnapManager,
-    viewUtils =                 require("js/helper-classes/3D/view-utils").ViewUtils,
-    drawUtils =                 require("js/helper-classes/3D/draw-utils").DrawUtils,
-    ElementPlanes =     require("js/helper-classes/3D/element-planes").ElementPlanes,
-    MathUtilsClass =    require("js/helper-classes/3D/math-utils").MathUtilsClass,
-    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    snapManager =       require("js/helper-classes/3D/snap-manager").SnapManager,
+    viewUtils =         require("js/helper-classes/3D/view-utils").ViewUtils,
+    drawUtils =         require("js/helper-classes/3D/draw-utils").DrawUtils,
+    ElementPlanes =     require("js/helper-classes/3D/element-planes").ElementPlanes,
+    MathUtilsClass =    require("js/helper-classes/3D/math-utils").MathUtilsClass,
+    VecUtils =          require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.StageDeps = Montage.create(Component, {