diff options
| author | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
| commit | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (patch) | |
| tree | e473e99d0e9ad8e9ca44cc6e2c2e86d2e8ff7477 /js/panels/Materials | |
| parent | 67a9691aba370cf4e9928ac6cf14548ded95fc92 (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-6fcaa4e923a19672b5860b4c6f67d836680e7e99.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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", |