diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /node_modules/descriptor.json | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.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", |