diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.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 | 3 |
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 | ||