diff options
| author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
| commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
| tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b | |
| parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
| parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
| download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz | |
Merge branch 'refs/heads/serialization'
124 files changed, 664 insertions, 934 deletions
| @@ -224,8 +224,7 @@ | |||
| 224 | <script type="text/montage-serialization"> | 224 | <script type="text/montage-serialization"> |
| 225 | { | 225 | { |
| 226 | "owner": { | 226 | "owner": { |
| 227 | "module": "montage/ui/loader.reel", | 227 | "prototype": "montage/ui/loader.reel", |
| 228 | "name": "Loader", | ||
| 229 | "properties": { | 228 | "properties": { |
| 230 | |||