aboutsummaryrefslogtreecommitdiff
path: root/js/io/templates
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-14 16:12:59 -0700
committerJose Antonio Marquez2012-06-14 16:12:59 -0700
commit358192a29533b34fa4938d59825f29bfd8d02b14 (patch)
treeab21c8b472aaec4cc85d46207a12b606ea8cffa4 /js/io/templates
parentaacfa86521c7d1c7159f1da1fad5bb2c638cc811 (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-358192a29533b34fa4938d59825f29bfd8d02b14.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/io/templates')
-rw-r--r--js/io/templates/descriptor.json7
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",