diff options
| author | hwc487 | 2012-05-11 15:09:53 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 15:09:53 -0700 |
| commit | 77c7e2eb1649f551c8adb01769f4041b8ad0dbba (patch) | |
| tree | 990402ef31f3ca8dd0dfc7e92d52e3a9ca1eff48 /js/panels/Materials | |
| parent | 634194bf87744dd6f693380ec878cc5dd42207a1 (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-77c7e2eb1649f551c8adb01769f4041b8ad0dbba.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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", |