aboutsummaryrefslogtreecommitdiff
path: root/node_modules/descriptor.json
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-27 09:10:58 -0700
committerPushkar Joshi2012-03-27 09:10:58 -0700
commit0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
treee778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/descriptor.json
parent753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
Merge branch 'master' into brushtool
Conflicts: js/controllers/elements/shapes-controller.js
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r--node_modules/descriptor.json35
1 files changed, 30 insertions, 5 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c460066c..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",
@@ -169,6 +195,7 @@
169 "ui/component.js", 195 "ui/component.js",
170 "ui/composer/composer.js", 196 "ui/composer/composer.js",
171 "ui/composer/long-press-composer.js", 197 "ui/composer/long-press-composer.js",
198 "ui/composer/press-composer.js",
172 "ui/composer/swipe-composer.js", 199 "ui/composer/swipe-composer.js",
173 "ui/composer/translate-composer.js", 200 "ui/composer/translate-composer.js",
174 "ui/condition.reel/condition.js", 201 "ui/condition.reel/condition.js",
@@ -219,21 +246,19 @@
219 "ui/popup/popup.reel/popup.css", 246 "ui/popup/popup.reel/popup.css",
220 "ui/popup/popup.reel/popup.html", 247 "ui/popup/popup.reel/popup.html",
221 "ui/popup/popup.reel/popup.js", 248 "ui/popup/popup.reel/popup.js",
222 "ui/progress.reel/progress.css",
223 "ui/progress.reel/progress.html",
224 "ui/progress.reel/progress.js", 249 "ui/progress.reel/progress.js",
225 "ui/progress.reel/rule.png",
226 "ui/progress.reel/scroll.png",
227 "ui/radio-button.reel/radio-button.js", 250 "ui/radio-button.reel/radio-button.js",
228 "ui/range-input.reel/range-input.js", 251 "ui/range-input.reel/range-input.js",
229 "ui/repetition.reel/repetition.js", 252 "ui/repetition.reel/repetition.js",
230 "ui/scroll-bars.reel/scroll-bars.html", 253 "ui/scroll-bars.reel/scroll-bars.html",
231 "ui/scroll-bars.reel/scroll-bars.js", 254 "ui/scroll-bars.reel/scroll-bars.js",
232 "ui/scroll.js",
233 "ui/scroller.reel/scroller.html", 255 "ui/scroller.reel/scroller.html",
234 "ui/scroller.reel/scroller.js", 256 "ui/scroller.reel/scroller.js",
235 "ui/scrollview.reel/scrollview.js", 257 "ui/scrollview.reel/scrollview.js",
236 "ui/select-input.reel/select-input.js", 258 "ui/select-input.reel/select-input.js",
259 "ui/skeleton/range-input.reel/range-input.css",
260 "ui/skeleton/range-input.reel/range-input.html",
261 "ui/skeleton/range-input.reel/range-input.js",
237 "ui/slot.reel/slot.js", 262 "ui/slot.reel/slot.js",
238 "ui/substitution.reel/substitution.js", 263 "ui/substitution.reel/substitution.js",
239 "ui/tabs.reel/tabs.css", 264 "ui/tabs.reel/tabs.css",