diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage-google/picasa-carousel.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel')
-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 | }, |