diff options
author | Jonathan Duran | 2012-05-09 13:36:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 13:36:45 -0700 |
commit | d0a5239630903953d9247d12b067f1b0a3e8381b (patch) | |
tree | 98112944664620185b45cf95dfb7d03b1794d85a /node_modules/components-data | |
parent | 1514f976119a9e5180a84a6afdf148bb25196bf8 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-d0a5239630903953d9247d12b067f1b0a3e8381b.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/components-data')
-rw-r--r-- | node_modules/components-data/feed-reader.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/map.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/picasa-carousel.json | 2 | ||||
-rw-r--r-- | node_modules/components-data/youtube-channel.json | 2 |
4 files changed, 4 insertions, 4 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 | ||