diff options
author | Eric Guzman | 2012-05-29 15:29:11 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-29 15:29:11 -0700 |
commit | 25ac55c285bb4850118c644dc57adaeda5b9a859 (patch) | |
tree | b645941d7916716cbaf4860355df4101fc0f4c3c /js/panels/PanelContainer.reel/PanelContainer.html | |
parent | 1fda3cea5f8dced1e14533969722e30b8ea1e6fa (diff) | |
parent | 58e454c828abf0b64fa62120359bcd78a0d34ac4 (diff) | |
download | ninja-25ac55c285bb4850118c644dc57adaeda5b9a859.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
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 1de88de3..1c144bf4 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
@@ -54,11 +54,12 @@ | |||
54 | "element": {"#": "panel_5"} | 54 | "element": {"#": "panel_5"} |
55 | } | 55 | } |
56 | }, | 56 | }, |
57 | |||
57 | "panel_6": { | 58 | "panel_6": { |
58 | "module": "js/panels/Panel.reel", | 59 | "module": "js/panels/Panel.reel", |
59 | "name": "Panel", | 60 | "name": "Panel", |
60 | "properties": { | 61 | "properties": { |
61 | "element": {"#": "panel_6"} | 62 | "element": {"#": "panel_6"} |
62 | } | 63 | } |
63 | }, | 64 | }, |
64 | 65 | ||