diff options
author | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
commit | 6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch) | |
tree | 779125b7c1fc668c02e0dfbb661494a16242c329 /js/data/panels-data.js | |
parent | f61545fd7054088efc88aafffd78e11df80d750d (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/data/panels-data.js')
-rw-r--r-- | js/data/panels-data.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..7a2d817a 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, { | |||
55 | scrollable: true, | 55 | scrollable: true, |
56 | collapsed: true, | 56 | collapsed: true, |
57 | open: true, | 57 | open: true, |
58 | modulePath: "js/panels/Components/ComponentsPanelBase.reel", | 58 | modulePath: "js/panels/components-panel.reel", |
59 | moduleName: "ComponentsPanelBase" | 59 | moduleName: "ComponentsPanel" |
60 | }, | 60 | }, |
61 | // { | 61 | // { |
62 | // name: "Project/Assets", | 62 | // name: "Project/Assets", |