diff options
| author | Eric Guzman | 2012-08-21 10:27:08 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-08-21 10:27:08 -0700 |
| commit | 2f4593e8a797898bb5c478eb8a14dac4660e8751 (patch) | |
| tree | 741022dbc6a0e24cfc0ba65eb5c02f83092562c3 /js/tools/ShapeTool.js | |
| parent | b3567811595f33f8fa8bcf36cd5aaf749120334d (diff) | |
| parent | ebb22628692375ce3bfce21353aaf5b820723f40 (diff) | |
| download | ninja-2f4593e8a797898bb5c478eb8a14dac4660e8751.tar.gz | |
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/tools/ShapeTool.js')
| -rwxr-xr-x | js/tools/ShapeTool.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index e1ca31e6..a4fd98e6 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
| @@ -33,8 +33,7 @@ var Montage = require("montage/core/core").Montage, | |||
| 33 | DrawingTool = require("js/tools/drawing-tool").DrawingTool, | 33 | DrawingTool = require("js/tools/drawing-tool").DrawingTool, |
| 34 | NJUtils = require("js/lib/NJUtils").NJUtils, | 34 | NJUtils = require("js/lib/NJUtils").NJUtils, |
| 35 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, | 35 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, |
| 36 | ShapeModel = require("js/models/shape-model").ShapeModel, | 36 | ShapeModel = require("js/models/shape-model").ShapeModel; |
| 37 | TagTool = require("js/tools/TagTool").TagTool; | ||
| 38 | 37 | ||
| 39 | var World = require("js/lib/drawing/world").World; | 38 | var World = require("js/lib/drawing/world").World; |
| 40 | 39 | ||