diff options
| author | hwc487 | 2012-06-13 14:04:09 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-13 14:04:09 -0700 |
| commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
| tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/components-panel.reel/components-panel.html | |
| parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.html')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index 1a257957..a8d71d50 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | "owner": { | 14 | "owner": { |
| 15 | "prototype": "js/panels/components-panel.reel", | 15 | "prototype": "js/panels/components-panel.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "components_panel"}, | 17 | "element": {"#": "components_panel"} |
| 18 | "controller": {"@": "componentsTree"} | ||
| 19 | } | 18 | } |
| 20 | }, | 19 | }, |
| 21 | 20 | ||