diff options
author | Valerio Virgillito | 2012-03-21 13:32:10 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-21 13:32:10 -0700 |
commit | a5b5ec05a032a5c21249857351b2af243584279c (patch) | |
tree | ab0acad7a5a914a709677125b6deefbdf5cab33b /node_modules | |
parent | 21a88a93f039bb7470c10d77efc01e549c4ae6dc (diff) | |
parent | 25c93afe8795c1b53859f4fa08220a947ace937e (diff) | |
download | ninja-a5b5ec05a032a5c21249857351b2af243584279c.tar.gz |
Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration
Diffstat (limited to 'node_modules')
-rw-r--r-- | node_modules/descriptor.json | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index d5bb81f3..e5606655 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -122,6 +122,32 @@ | |||
122 | "data/sqlaccess/sqlstore.js", | 122 | "data/sqlaccess/sqlstore.js", |
123 | "data/store.js", | 123 | "data/store.js", |
124 | "data/transactionid.js", | 124 | "data/transactionid.js", |
125 | "examples/feed-reader/images/07-map-marker.png", | ||
126 | "examples/feed-reader/images/10-medical.png", | ||
127 | "examples/feed-reader/images/100-coffee.png", | ||
128 | "examples/feed-reader/images/107-widescreen.png", | ||
129 | "examples/feed-reader/images/125-food.png", | ||
130 | "examples/feed-reader/images/142-wine-bottle.png", | ||
131 | "examples/feed-reader/images/34-coffee.png", | ||
132 | "examples/feed-reader/images/35-shopping.png", | ||
133 | "examples/feed-reader/images/38-airplane.png", | ||
134 | "examples/feed-reader/images/41-picture-frame.png", | ||
135 | "examples/feed-reader/images/47-fuel.png", | ||
136 | "examples/feed-reader/images/48-fork-and-knife.png", | ||
137 | "examples/feed-reader/images/80-shopping-cart.png", | ||
138 | "examples/feed-reader/images/87-wine-glass.png", | ||
139 | "examples/feed-reader/images/88-beer-mug.png", | ||
140 | "examples/feed-reader/index.html", | ||
141 | "examples/feed-reader/main.reel/main.html", | ||
142 | "examples/feed-reader/main.reel/main.js", | ||
143 | "examples/feed-reader/map-example.reel/main.css", | ||
144 | "examples/feed-reader/map-example.reel/main.html", | ||
145 | "examples/feed-reader/map-example.reel/main.js", | ||
146 | "examples/feed-reader/package.json", | ||
147 | "examples/youtube-channel-example/index.html", | ||
148 | "examples/youtube-channel-example/package.json", | ||
149 | "examples/youtube-channel-example/style.css", | ||
150 | "examples/youtube-channel-example/youtube-channel-example.js", | ||
125 | "montage.js", | 151 | "montage.js", |
126 | "node.js", | 152 | "node.js", |
127 | "package.json", | 153 | "package.json", |