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>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/controllers/elements/controller-factory.js
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 2bf3eae0..eb8e977c 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -33,7 +33,7 @@ var Montage         = require("montage/core/core").Montage;
 var BodyController = require("js/controllers/elements/body-controller").BodyController,
    BlockController = require("js/controllers/elements/block-controller").BlockController,
    ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
-        ImageController = require("js/controllers/elements/image-controller").ImageController,
+    ImageController = require("js/controllers/elements/image-controller").ImageController,
    VideoController = require("js/controllers/elements/video-controller").VideoController,
    ComponentController = require("js/controllers/elements/component-controller").ComponentController,
    CanvasController = require("js/controllers/elements/canvas-controller").CanvasController;
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/controllers/elements/controller-factory.js
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js index 2bf3eae0..eb8e977c 100755 --- a/js/controllers/elements/controller-factory.js +++ b/js/controllers/elements/controller-factory.js
@@ -33,7 +33,7 @@ var Montage = require("montage/core/core").Montage;
33	var BodyController = require("js/controllers/elements/body-controller").BodyController,	33	var BodyController = require("js/controllers/elements/body-controller").BodyController,
34	BlockController = require("js/controllers/elements/block-controller").BlockController,	34	BlockController = require("js/controllers/elements/block-controller").BlockController,
35	ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,	35	ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
36	ImageController = require("js/controllers/elements/image-controller").ImageController,	36	ImageController = require("js/controllers/elements/image-controller").ImageController,
37	VideoController = require("js/controllers/elements/video-controller").VideoController,	37	VideoController = require("js/controllers/elements/video-controller").VideoController,
38	ComponentController = require("js/controllers/elements/component-controller").ComponentController,	38	ComponentController = require("js/controllers/elements/component-controller").ComponentController,
39	CanvasController = require("js/controllers/elements/canvas-controller").CanvasController;	39	CanvasController = require("js/controllers/elements/canvas-controller").CanvasController;