diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/descriptor.json | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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", |