diff options
author | Armen Kesablyan | 2012-05-14 11:45:11 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-14 11:45:11 -0700 |
commit | 9e6c0a247bd2f14d92278bcd97fff40277b71667 (patch) | |
tree | 4194388c03814b9168922dbf2907edf426295874 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | 9fc3b70bf57e10846e71808c6041fbc339a435d1 (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-9e6c0a247bd2f14d92278bcd97fff40277b71667.tar.gz |
Merge branch 'refs/heads/masterDomArc' into binding
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-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", |