Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

1 files changed, 14 insertions, 2 deletions

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 2422f5e7..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            modulePath: "js/panels/Components/ComponentsPanelBase.reel",
-            moduleName: "ComponentsPanelBase"
+            modulePath: "js/panels/components-panel.reel",
+            moduleName: "ComponentsPanel"
         },
 //        {
 //            name: "Project/Assets",
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
             open: true,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
+        },
+        {
+            name: "History",
+            minHeight: 100,
+            height: 100,
+            maxHeight: null,
+            flexible: true,
+            collapsed: true,
+            scrollable: true,
+            open: true,
+            modulePath: "js/panels/history-panel/history.reel",
+            moduleName: "History"
         }
     ]
     }