diff options
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/stage/stage-deps.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
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>
Diffstat (limited to 'js/stage/stage-deps.js')
-rwxr-xr-x | js/stage/stage-deps.js | 16 |
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 | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
33 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, | 33 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, |
34 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, | 34 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, |
35 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, | 35 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, |
36 | ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, | 36 | ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, |
37 | MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, | 37 | MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, |
38 | VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 38 | VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
39 | 39 | ||
40 | exports.StageDeps = Montage.create(Component, { | 40 | exports.StageDeps = Montage.create(Component, { |
41 | 41 | ||