diff options
author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/PanelContainer.reel/PanelContainer.html | |
parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz |
Merge branch 'pentool' into brushtool
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 | } |