diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html')
| -rw-r--r-- | node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html index 3e88adc0..9590fce9 100644 --- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html +++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
| 10 | { | 10 | { |
| 11 | "owner": { | 11 | "owner": { |
| 12 | "module": "montage/ui/picasa-carousel.reel/image.reel", | 12 | "prototype": "montage/ui/picasa-carousel.reel/image.reel", |
| 13 | "name": "Image", | ||
| 14 | "properties": { | 13 | "properties": { |
| 15 | "element": {"#": "Image"} | 14 | "element": {"#": "Image"} |
| 16 | } | 15 | } |