diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js')
| -rw-r--r-- | node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js index 0b669b80..7e9c64ec 100644 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | |||
| @@ -45,7 +45,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
| 45 | 45 | ||
| 46 | resultCount: { | 46 | resultCount: { |
| 47 | enumerable: false, | 47 | enumerable: false, |
| 48 | value: 1000 | 48 | value: 500 |
| 49 | }, | 49 | }, |
| 50 | 50 | ||
| 51 | prepareForDraw: { | 51 | prepareForDraw: { |