diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/treeview/treeview.reel | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/treeview/treeview.reel')
| -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 d70b016c..4f9e6a72 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html | |||
| @@ -26,7 +26,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 26 | "name" : "Branch" | 26 | "name" : "Branch" |
| 27 | }, | 27 | }, |
| 28 | "defaultLeaf" : { | 28 | "defaultLeaf" : { |
| 29 | "module" : "js/components/treeview/presets-leaf.reel", | 29 | "module" : "js/components/treeview/leaf.reel", |
| 30 | "name" : "Leaf" | 30 | "name" : "Leaf" |
| 31 | }, | 31 | }, |
| 32 | "scrollview": { | 32 | "scrollview": { |