diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/panels/Materials/Materials.xml | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/panels/Materials/Materials.xml')
| -rwxr-xr-x | js/panels/Materials/Materials.xml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml deleted file mode 100755 index a958575e..00000000 --- a/js/panels/Materials/Materials.xml +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="ISO-8859-1"?> | ||
| 2 | <tree id="Materials"> | ||
| 3 | <folder id="ninjaMaterials" label="Ninja Materials"> | ||
| 4 | <leaf id="UberMaterial" label="Uber" /> | ||
| 5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> | ||
| 6 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | ||
| 7 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | ||
| 8 | <leaf id="FlatMaterial" label="Flat" /> | ||
| 9 | </folder> | ||
| 10 | <folder id="customMaterials" label="Custom Materials"> | ||
| 11 | <leaf id="CheckerBoard" label="CheckerBoard" /> | ||
| 12 | <leaf id="ShinyMetal" label="Shiny Metal" /> | ||
| 13 | </folder> | ||
| 14 | </tree> \ No newline at end of file | ||