aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-25 13:34:04 -0700
committerNivesh Rajbhandari2012-04-25 13:34:04 -0700
commit32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch)
treefbf05f2dfc91e57ab9598046ff16798ea0ae1966 /node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
parent60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
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.html3
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 }