diff options
| author | hwc487 | 2012-05-31 17:11:08 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-31 17:11:08 -0700 |
| commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
| tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/PanelContainer.reel/PanelContainer.html | |
| parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
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 | } |