aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel/PanelContainer.html
diff options
context:
space:
mode:
authorEric Guzman2012-04-23 11:55:55 -0700
committerEric Guzman2012-04-23 11:55:55 -0700
commitcdd1189e349e2974681e2c451e861e5b0db570e4 (patch)
treed8823c3d050e011032c563d20c1a5f61e67ae740 /js/panels/PanelContainer.reel/PanelContainer.html
parentc0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff)
parent5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
downloadninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 1561f973..ef023f01 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -69,6 +69,13 @@
69 } 69 }
70 }, 70 },
71 71
72 "panel_6": {
73 "prototype": "js/panels/Panel.reel",
74 "properties": {
75 "element": {"#": "panel_6"}
76 }
77 },
78
72 "owner": { 79 "owner": {
73 "module": "js/panels/PanelContainer.reel", 80 "module": "js/panels/PanelContainer.reel",
74 "name": "PanelContainer", 81 "name": "PanelContainer",