diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 | ||