diff options
| author | hwc487 | 2012-04-27 14:35:46 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-27 14:35:46 -0700 |
| commit | 1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch) | |
| tree | 3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/models/properties-3d.js | |
| parent | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/models/properties-3d.js')
| -rwxr-xr-x | js/models/properties-3d.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index c1270c3b..e571e505 100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.js | |||
| @@ -5,8 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
| 8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component; |
| 9 | NJUtils = require("js/lib/NJUtils").NJUtils; | ||
| 10 | 9 | ||
| 11 | exports.Properties3D = Montage.create(Component, { | 10 | exports.Properties3D = Montage.create(Component, { |
| 12 | 11 | ||