diff options
author | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
commit | 2bae1b3148233288ec0bc50876935bdfea1f288c (patch) | |
tree | 686fa3b5b9615941bb7013f35c91e8f326b049db /node_modules/descriptor.json | |
parent | 2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r-- | node_modules/descriptor.json | 10 |
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", |