diff options
author | Jon Reid | 2012-03-01 09:23:46 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-01 09:23:46 -0800 |
commit | e67000c704e284f4ab9b50c845853988272ce800 (patch) | |
tree | fad04a6a5ef5bfc8fa4efe88dac3eb7329bc3596 /js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | |
parent | 939cb7eccb8a5ec655fbde8b470894d293832307 (diff) | |
parent | 82ed48cc48ae1f8163021a0998e00d87da396d65 (diff) | |
download | ninja-e67000c704e284f4ab9b50c845853988272ce800.tar.gz |
Merge branch 'Timeline-main' into Timeline-newdoc
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js')
-rwxr-xr-x | js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js index 3cbd4369..003724bb 100755 --- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | |||
@@ -45,7 +45,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
45 | }, | 45 | }, |
46 | 46 | ||
47 | initPanelOrder: { | 47 | initPanelOrder: { |
48 | value: ['PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel'] | 48 | value: ['ColorPanel', 'PropertiesPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel'] |
49 | }, | 49 | }, |
50 | 50 | ||
51 | panelOrder: { | 51 | panelOrder: { |