aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJonathan Duran2012-04-06 08:42:38 -0700
committerJonathan Duran2012-04-06 08:42:38 -0700
commit921a106cc1159b93068a4c635fcc0c74084446a5 (patch)
tree1cffdeb4a3d838f95bc0571da655615575a5375a /js/data
parente186c49247689b5c2df6125037e2473636701d17 (diff)
parent7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff)
downloadninja-921a106cc1159b93068a4c635fcc0c74084446a5.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/data')
-rw-r--r--js/data/panels-data.js4
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",