aboutsummaryrefslogtreecommitdiff
path: root/node_modules/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-28 09:50:28 -0700
committerJose Antonio Marquez2012-06-28 09:50:28 -0700
commitee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /node_modules/descriptor.json
parentca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
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",