diff options
| author | John Mayhew | 2012-07-09 17:28:24 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
| commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Materials/materials-data.json | |
| parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
| parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
| download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/Materials/materials-data.json')
| -rw-r--r-- | js/panels/Materials/materials-data.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index a5d8997b..fde82d3d 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
| @@ -101,6 +101,11 @@ | |||
| 101 | "id" : "Z-Invert" | 101 | "id" : "Z-Invert" |
| 102 | } | 102 | } |
| 103 | ] | 103 | ] |
| 104 | }, | ||
| 105 | { | ||
| 106 | "label": "Custom Materials", | ||
| 107 | "children": [ | ||
| 108 | ] | ||
| 104 | } | 109 | } |
| 105 | ] | 110 | ] |
| 106 | } \ No newline at end of file | 111 | } \ No newline at end of file |