diff options
author | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
commit | afc53c6f553c97ab778154154aa2b7a146cb5fef (patch) | |
tree | 66b5ec886a49894feda44ccf8b5233ef39a46536 /js/panels/Materials/Materials.xml | |
parent | 8974ecd564563a991ff96f9cb6d47da172174242 (diff) | |
parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
download | ninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz |
Merge branch 'refs/heads/master' into local-storage-version
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" /> |