diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-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/components/treeview/ninja-branch.reel/ninja-branch.html')
| -rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 60894fbc..8b808488 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html | |||
| @@ -105,7 +105,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 105 | "properties": { | 105 | "properties": { |
| 106 | "element": { "#": "branchList" }, | 106 | "element": { "#": "branchList" }, |
| 107 | "contentController": {"@": "arrayController" }, | 107 | "contentController": {"@": "arrayController" }, |
| 108 | "selectionEnabled": true | 108 | "isSelectionEnabled": true |
| 109 | } | 109 | } |
| 110 | }, | 110 | }, |
| 111 | 111 | ||