aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /node_modules/components-data
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/feed-reader.json2
-rw-r--r--node_modules/components-data/map.json2
-rw-r--r--node_modules/components-data/picasa-carousel.json2
-rw-r--r--node_modules/components-data/youtube-channel.json2
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