diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /node_modules/descriptor.json | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r-- | node_modules/descriptor.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index 5617234f..6d29cb58 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -220,7 +220,6 @@ | |||
220 | "montage/ui/controller/array-controller.js", | 220 | "montage/ui/controller/array-controller.js", |
221 | "montage/ui/controller/media-controller.js", | 221 | "montage/ui/controller/media-controller.js", |
222 | "montage/ui/controller/object-controller.js", | 222 | "montage/ui/controller/object-controller.js", |
223 | "montage/ui/controller/paged-array-controller.js", | ||
224 | "montage/ui/date-input.reel/date-input.js", | 223 | "montage/ui/date-input.reel/date-input.js", |
225 | "montage/ui/dom.js", | 224 | "montage/ui/dom.js", |
226 | "montage/ui/dynamic-text.reel/dynamic-text.js", | 225 | "montage/ui/dynamic-text.reel/dynamic-text.js", |