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/layout/tools-properties.reel/tools-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/layout/tools-properties.reel/tools-properties.js')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js index 8c4da4f4..fad86a66 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.js +++ b/js/components/layout/tools-properties.reel/tools-properties.js | |||
| @@ -174,7 +174,7 @@ exports.ToolsProperties = Montage.create(Component, { | |||
| 174 | this._selectedTool = value; | 174 | this._selectedTool = value; |
| 175 | this[this._selectedTool.properties].visible = true; | 175 | this[this._selectedTool.properties].visible = true; |
| 176 | */ | 176 | */ |
| 177 | 177 | ||
| 178 | 178 | ||
| 179 | } | 179 | } |
| 180 | } | 180 | } |