diff options
| author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
| commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
| tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Materials/Materials.xml | |
| parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Materials/Materials.xml')
| -rwxr-xr-x | js/panels/Materials/Materials.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index e955623a..a958575e 100755 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="ISO-8859-1"?> | 1 | <?xml version="1.0" encoding="ISO-8859-1"?> |
| 2 | <tree id="Materials"> | 2 | <tree id="Materials"> |
| 3 | <folder id="ninjaMaterials" label="Ninja Materials"> | 3 | <folder id="ninjaMaterials" label="Ninja Materials"> |
| 4 | <leaf id="UberMaterial" label="Uber" /> | 4 | <leaf id="UberMaterial" label="Uber" /> |
| 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> | 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
| 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> |
| 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> |