diff options
| author | hwc487 | 2012-03-23 13:49:03 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-23 13:49:03 -0700 |
| commit | 51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch) | |
| tree | 1524c53d027d1f2f8cbb759f61e4d73b52b00481 /js/controllers/selection-controller.js | |
| parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
| parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
| download | ninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz | |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/controllers/selection-controller.js')
| -rwxr-xr-x | js/controllers/selection-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index f29b39e2..53cca029 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
| @@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | var Montage = require("montage/core/core").Montage, | 8 | var Montage = require("montage/core/core").Montage, |
| 9 | Component = require("montage/ui/component").Component; | 9 | Component = require("montage/ui/component").Component, |
| 10 | NJUtils = require("js/lib/NJUtils").NJUtils; | ||
| 10 | 11 | ||
| 11 | exports.SelectionController = Montage.create(Component, { | 12 | exports.SelectionController = Montage.create(Component, { |
| 12 | 13 | ||