diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /node_modules/components-data/picasa-carousel.json | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
| -rw-r--r-- | node_modules/components-data/picasa-carousel.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index b0711b12..4ab329e5 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | "default": "" | 12 | "default": "" |
| 13 | } | 13 | } |
| 14 | ], | 14 | ], |
| 15 | |||
| 15 | "defaultStyles": { | 16 | "defaultStyles": { |
| 16 | "width":"800px", | 17 | "width":"800px", |
| 17 | "height":"160px", | 18 | "height":"160px", |