diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/io/templates | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/io/templates')
-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", |