diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/toolbar.reel/toolbar.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/toolbar.reel/toolbar.js')
| -rw-r--r-- | js/components/toolbar.reel/toolbar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js index 0fcb1da7..1716c05b 100644 --- a/js/components/toolbar.reel/toolbar.js +++ b/js/components/toolbar.reel/toolbar.js | |||
| @@ -36,7 +36,7 @@ exports.Toolbar = Montage.create(Component, { | |||
| 36 | value: null, | 36 | value: null, |
| 37 | serializable: true | 37 | serializable: true |
| 38 | }, | 38 | }, |
| 39 | 39 | ||
| 40 | _needsButtonProperties : { | 40 | _needsButtonProperties : { |
| 41 | value: null | 41 | value: null |
| 42 | }, | 42 | }, |