diff options
author | Jose Antonio Marquez | 2012-06-27 16:26:53 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-27 16:26:53 -0700 |
commit | 82abdd67e024d668dfb0a7b72ad81e28367b9fd5 (patch) | |
tree | 09dc5bdd1d132c2871ff8ec216dc050f93ac516f /node_modules/descriptor.json | |
parent | 4f0104b0120219cbba2e0ac02c7b6aea437dd212 (diff) | |
parent | ec438dd0b501296f9aca8fdab7be99e518d7a8fd (diff) | |
download | ninja-82abdd67e024d668dfb0a7b72ad81e28367b9fd5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
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", |