diff options
| author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
| commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Materials/materials-data.json | |
| parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
| parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
| download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 |