diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/controllers/elements/controller-factory.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/controllers/elements/controller-factory.js')
| -rwxr-xr-x | js/controllers/elements/controller-factory.js | 2 |
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; | |||
| 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; |