aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel/components-panel.html
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/components-panel.reel/components-panel.html
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.html')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html3
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