diff options
| author | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
| commit | e9c3c7d758fc59ad7b731730dd935170844d9538 (patch) | |
| tree | 2972d0384605eef4ba1a43636bd48db724f15713 /js/panels/Materials/materials-popup.reel/materials-popup.js | |
| parent | cff7deb476f4095d7d3d76c92360617d3316a96f (diff) | |
| parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
| download | ninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz | |
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index c57bb2d7..193e72b7 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
| @@ -5,9 +5,8 @@ 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 | var Button = require("js/components/button.reel").Button; | 9 | MaterialsModel = require("js/models/materials-model").MaterialsModel; |
| 10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
| 11 | 10 | ||
| 12 | //////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////// |
| 13 | //Exporting as MaterialsPopup | 12 | //Exporting as MaterialsPopup |