aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel/ninja-branch.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 15:11:49 -0800
committerJose Antonio Marquez2012-02-13 15:11:49 -0800
commitf70701db069a10dc5195605fc378a022125b434f (patch)
treed7491f02cd579fbddf9d7e37e4e2419a3845ed15 /js/components/treeview/ninja-branch.reel/ninja-branch.html
parent8172ffc0fa2a4f8a575b80e725c157e328d3c94f (diff)
parent38224745a27e039b79c893830c282b2ba558ab51 (diff)
downloadninja-f70701db069a10dc5195605fc378a022125b434f.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/components/treeview/ninja-branch.reel/ninja-branch.html')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html3
1 files changed, 2 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 4d557a94..13f1c575 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -110,7 +110,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
110 "name": "Repetition", 110 "name": "Repetition",
111 "properties": { 111 "properties": {
112 "element": { "#": "branchList" }, 112 "element": { "#": "branchList" },
113 "contentController": {"@": "arrayController" } 113 "contentController": {"@": "arrayController" },
114 "selectionEnabled": true
114 } 115 }
115 }, 116 },
116 117