diff options
| author | Eric Guzman | 2012-05-17 17:09:27 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-17 17:09:27 -0700 |
| commit | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (patch) | |
| tree | 2742812a1437f3c7f6a9151e2a786299bb538922 /js/panels/presets/style-presets.reel | |
| parent | 4e43fe2c97833c0847a53484c9589697e64137dc (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-82954f400f7f8609aef0d2bc1f44c9d960907be6.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/style-presets.reel')
| -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", |