aboutsummaryrefslogtreecommitdiff
path: root/node_modules/descriptor.json
diff options
context:
space:
mode:
authorEric Guzman2012-06-28 11:02:16 -0700
committerEric Guzman2012-06-28 11:02:16 -0700
commitf89895e5fb94a192d25f26249dadcb8ab225c72b (patch)
tree8ce918bb2605c67c4fc093e96543de8e10882f1d /node_modules/descriptor.json
parente1f83a2c603bf9ddb74889f7ba5b697bb474edaa (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-f89895e5fb94a192d25f26249dadcb8ab225c72b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r--node_modules/descriptor.json10
1 files changed, 9 insertions, 1 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index b6868954..9a2177c6 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -82,7 +82,11 @@
82 {"name": "feed-reader.reel"} 82 {"name": "feed-reader.reel"}
83 ] 83 ]
84 }, 84 },
85 {"name": "map.reel"}, 85 {"name": "map.reel",
86 "children": [
87 {"name": "icons"}
88 ]
89 },
86 {"name": "picasa-carousel.reel", 90 {"name": "picasa-carousel.reel",
87 "children": [ 91 "children": [
88 {"name": "image.reel"} 92 {"name": "image.reel"}
@@ -370,6 +374,10 @@
370 "montage-google/map.reel/map.js", 374 "montage-google/map.reel/map.js",
371 "montage-google/map.reel/map.html", 375 "montage-google/map.reel/map.html",
372 "montage-google/map.reel/map.css", 376 "montage-google/map.reel/map.css",
377 "montage-google/map.reel/icons/fork-and-knife.png",
378 "montage-google/map.reel/icons/medical.png",
379 "montage-google/map.reel/icons/picture-frame.png",
380 "montage-google/map.reel/icons/cafe.png",
373 "montage-google/picasa-carousel.reel/image.reel/image.html", 381 "montage-google/picasa-carousel.reel/image.reel/image.html",
374 "montage-google/picasa-carousel.reel/image.reel/image.js", 382 "montage-google/picasa-carousel.reel/image.reel/image.js",
375 "montage-google/picasa-carousel.reel/picasa-carousel.css", 383 "montage-google/picasa-carousel.reel/picasa-carousel.css",