aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/eraser-properties.reel/eraser-properties.js
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-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/eraser-properties.reel/eraser-properties.js')
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
index 5c997ee3..dbab798a 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
34 34
35exports.EraserProperties = Montage.create(ToolProperties, { 35exports.EraserProperties = Montage.create(ToolProperties, {
36 36
37 37
38 _subPrepare: { 38 _subPrepare: {
39 value: function() { 39 value: function() {
40 //this.divElement.addEventListener("click", this, false); 40 //this.divElement.addEventListener("click", this, false);