aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-23 13:37:15 -0700
committerJose Antonio Marquez2012-05-23 13:37:15 -0700
commit16decc5726eafbb25675c61be6df85a378ac1fac (patch)
tree5590c4a20a5d9297d3e66a1d290db32f028047eb /js/panels/PanelContainer.reel
parent27e6e1238ec1adb34aa396074e2559801c7e4314 (diff)
parent108764dbdaa0c040de9146c2d722b6e53830cd54 (diff)
downloadninja-16decc5726eafbb25675c61be6df85a378ac1fac.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/panels/PanelContainer.reel')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
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 }