diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /node_modules | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules')
90 files changed, 7977 insertions, 4013 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 39da73f3..5e8ca527 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "feedreader", | 2 | "component": "feedreader", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/feed-reader/feed-reader.reel", | 4 | "module": "montage-google/feed-reader/feed-reader.reel", |
| 5 | 5 | ||
| 6 | "name": "FeedReader", | 6 | "name": "FeedReader", |
| 7 | 7 | ||
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json index 655d222d..e80fa510 100644 --- a/node_modules/components-data/map.json +++ b/node_modules/components-data/map.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "map", | 2 | "component": "map", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/map.reel", | 4 | "module": "montage-google/map.reel", |
| 5 | 5 | ||
| 6 | "name": "Map", | 6 | "name": "Map", |
| 7 | 7 | ||
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 | ||
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json index c909fd1b..44180d72 100644 --- a/node_modules/components-data/youtube-channel.json +++ b/node_modules/components-data/youtube-channel.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "youtube-channel", | 2 | "component": "youtube-channel", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/youtube-channel.reel", | 4 | "module": "montage-google/youtube-channel.reel", |
| 5 | 5 | ||
| 6 | "name": "YoutubeChannel", | 6 | "name": "YoutubeChannel", |
| 7 | 7 | ||
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index e5606655..5617234f 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
| @@ -1,285 +1,323 @@ | |||
| 1 | { | 1 | { |
| 2 | "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Cop | ||