diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Materials/MaterialsPanel.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Materials/MaterialsPanel.js')
| -rwxr-xr-x | js/panels/Materials/MaterialsPanel.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Materials/MaterialsPanel.js b/js/panels/Materials/MaterialsPanel.js index 9d7f447a..4291f39b 100755 --- a/js/panels/Materials/MaterialsPanel.js +++ b/js/panels/Materials/MaterialsPanel.js | |||
| @@ -29,8 +29,8 @@ 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 | PanelBase = require("js/panels/PanelBase").PanelBase, | 32 | PanelBase = require("js/panels/PanelBase").PanelBase, |
| 33 | MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel; | 33 | MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel; |
| 34 | 34 | ||
| 35 | exports.MaterialsPanel = Montage.create(PanelBase, { | 35 | exports.MaterialsPanel = Montage.create(PanelBase, { |
| 36 | id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true}, | 36 | id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true}, |