diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules/components-data/picasa-carousel.json | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
| -rw-r--r-- | node_modules/components-data/picasa-carousel.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index 2eb601c7..b0711b12 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "picasa-carousel", | 2 | "component": "picasa-carousel", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/picasa-carousel.reel", | 4 | "module": "montage-google/picasa-carousel.reel", |
| 5 | 5 | ||
| 6 | "name": "PicasaCarousel", | 6 | "name": "PicasaCarousel", |
| 7 | 7 | ||