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/tools-properties/pen-properties.reel/pen-properties.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/tools-properties/pen-properties.reel/pen-properties.js')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index 460c9633..66260ac3 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
| @@ -108,7 +108,7 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | |||
| 108 | 108 | ||
| 109 | strokeSize: { | 109 | strokeSize: { |
| 110 | get: function () { | 110 | get: function () { |
| 111 | return this._strokeSize; | 111 | return this._strokeSize; |
| 112 | } | 112 | } |
| 113 | }, | 113 | }, |
| 114 | 114 | ||