diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/treeview/treeview.reel/treeview.html | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/treeview/treeview.reel/treeview.html')
-rw-r--r-- | js/components/treeview/treeview.reel/treeview.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index 1bed0f0b..9ab575c6 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html | |||
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
27 | "prototype" : "js/components/treeview/leaf.reel" | 27 | "prototype" : "js/components/treeview/leaf.reel" |
28 | }, | 28 | }, |
29 | "scrollview": { | 29 | "scrollview": { |
30 | "prototype": "montage/ui/scrollview.reel[Scrollview]", | 30 | "prototype": "montage/ui/scroller.reel", |
31 | "properties": { | 31 | "properties": { |
32 | "element": {"#": "treeView"}, | 32 | "element": {"#": "treeView"}, |
33 | "axis": "vertical" | 33 | "axis": "vertical" |