diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
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 | ||