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/Materials | |
| 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/Materials')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 7fc48a55..b5d7a869 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | "prototype": "js/panels/Materials/materials-popup.reel" | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
| 51 | }, | 51 | }, |
| 52 | "materialsController" : { | 52 | "materialsController" : { |
| 53 | "prototype": "js/controllers/tree-controller", | 53 | "prototype": "js/components/controllers/tree-controller", |
| 54 | "properties" : { | 54 | "properties" : { |
| 55 | "branchKey" : "children", | 55 | "branchKey" : "children", |
| 56 | "labelKey" : "label", | 56 | "labelKey" : "label", |