diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules/descriptor.json | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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", |