diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /js/tools/drawing-tool-base.js | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'js/tools/drawing-tool-base.js')
| -rw-r--r-- | js/tools/drawing-tool-base.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 6fc34911..cd895102 100644 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
| @@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component; | |||
| 10 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 10 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; |
| 11 | var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; | 11 | var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; |
| 12 | var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 12 | var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
| 13 | var Properties3D = require("js/helper-classes/Properties3D").Properties3D; | ||
| 14 | var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; | 13 | var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; |
| 15 | 14 | ||
| 16 | exports.DrawingToolBase = Montage.create(Montage, { | 15 | exports.DrawingToolBase = Montage.create(Montage, { |