diff options
author | Valerio Virgillito | 2012-05-16 01:00:22 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 01:00:22 -0700 |
commit | f9f8fdc3000042ba5b4504d91870dc9a32ef25eb (patch) | |
tree | 606f22568ad2be0f7aed266a4d20de576f44002f /js/panels/presets/style-presets.reel/style-presets.html | |
parent | a9672abd32c2e03b8607c1af4903c90f7ff9531c (diff) | |
download | ninja-f9f8fdc3000042ba5b4504d91870dc9a32ef25eb.tar.gz |
Squashed master into dom-architecture
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/presets/style-presets.reel/style-presets.html')
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html index a3d718bb..bebff22d 100644 --- a/js/panels/presets/style-presets.reel/style-presets.html +++ b/js/panels/presets/style-presets.reel/style-presets.html | |||
@@ -17,7 +17,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
17 | } | 17 | } |
18 | }, | 18 | }, |
19 | "presetsController" : { | 19 | "presetsController" : { |
20 | "prototype": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
21 | "properties" : { | 21 | "properties" : { |
22 | "branchKey" : "children", | 22 | "branchKey" : "children", |
23 | "labelKey" : "text", | 23 | "labelKey" : "text", |