diff options
| author | John Mayhew | 2012-05-15 10:44:29 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-15 10:44:29 -0700 |
| commit | 6bced2460423b144c6327e7a21d27bd8f279cbd3 (patch) | |
| tree | 5efc0dc482b63bb78070cda9819cab3e7ef1502e /js/panels/presets/style-presets.reel/style-presets.html | |
| parent | 035c851a955952d0a1c89a7c8a646b674ab3f4f2 (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-6bced2460423b144c6327e7a21d27bd8f279cbd3.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
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", |