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/treeview.reel/treeview.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
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" |