diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/PanelContainer.reel | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer.reel')
| -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 | } |