diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html')
| -rwxr-xr-x | node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html index f7c8a766..dc70a19c 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "owner": { | 14 | "owner": { |
| 15 | "prototype": "montage-google/picasa-carousel.reel", | 15 | "prototype": "picasa-carousel.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "montage-google-picasa-carousel"}, | 17 | "element": {"#": "montage-google-picasa-carousel"}, |
| 18 | "flow": {"@": "flow"} | 18 | "flow": {"@": "flow"} |
| @@ -29,7 +29,7 @@ | |||
| 29 | } | 29 | } |
| 30 | }, | 30 | }, |
| 31 | "image": { | 31 | "image": { |
| 32 | "prototype": "montage-google/picasa-carousel.reel/image.reel", | 32 | "prototype": "picasa-carousel.reel/image.reel", |
| 33 | "properties": { | 33 | "properties": { |
| 34 | "element": {"#": "image"} | 34 | "element": {"#": "image"} |
| 35 | }, | 35 | }, |