diff options
| author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
| commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
| tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/panels/PanelContainer.reel/PanelContainer.html | |
| parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index ccefd3ae..1c144bf4 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
| @@ -56,7 +56,8 @@ | |||
| 56 | }, | 56 | }, |
| 57 | 57 | ||
| 58 | "panel_6": { | 58 | "panel_6": { |
| 59 | "prototype": "js/panels/Panel.reel", | 59 | "module": "js/panels/Panel.reel", |
| 60 | "name": "Panel", | ||
| 60 | "properties": { | 61 | "properties": { |
| 61 | "element": {"#": "panel_6"} | 62 | "element": {"#": "panel_6"} |
| 62 | } | 63 | } |