diff options
author | hwc487 | 2012-06-14 16:20:01 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 16:20:01 -0700 |
commit | 2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265 (patch) | |
tree | 54f8fb15e1f073f159e577af8324a447789d7a64 /js/io | |
parent | f0fc7a5678093cce986bd99fef2c5c88add19b68 (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/io')
-rw-r--r-- | js/io/templates/descriptor.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index 9c9c4ac8..8edbedd2 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json | |||
@@ -90,7 +90,7 @@ | |||
90 | "uri":"js/io/templates/files/banner.txt", | 90 | "uri":"js/io/templates/files/banner.txt", |
91 | "type":"file", | 91 | "type":"file", |
92 | "fileExtension":".html", | 92 | "fileExtension":".html", |
93 | "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"] | 93 | "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "728x90"] |
94 | }, | 94 | }, |
95 | 95 | ||
96 | "120x600":{ | 96 | "120x600":{ |
@@ -123,6 +123,11 @@ | |||
123 | "uri": "336x280", | 123 | "uri": "336x280", |
124 | "type":"file" | 124 | "type":"file" |
125 | }, | 125 | }, |
126 | "728x90":{ | ||
127 | "name": "Leaderboard", | ||
128 | "uri": "728x90", | ||
129 | "type":"file" | ||
130 | }, | ||
126 | 131 | ||
127 | "js/io/templates/files/animation.txt":{ | 132 | "js/io/templates/files/animation.txt":{ |
128 | "name":"Animation", | 133 | "name":"Animation", |