diff options
| author | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
| commit | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (patch) | |
| tree | 49b07dfb52252ac986c567ad5c3a7c39ebcc86e2 /js/panels/PanelContainer/PanelContainer.reel | |
| parent | 551e1f2be11e9e6ab7af17816396b88aafd57dff (diff) | |
| parent | 2b9f63089534356607ad7e0ddde6f22e42d04f80 (diff) | |
| download | ninja-b09956e4a9a35c5588cc7cd1f01efb617cbe0884.tar.gz | |
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel')
| -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: { |