Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 4b6705c1..93caf984 100644..100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -146,7 +146,7 @@ exports.ZoomTool = Montage.create(DrawingTool, {
                         var dx = Math.abs(point.x - this.downPoint.x),
                                 dy = Math.abs(point.y - this.downPoint.y);
 
-                        if ((dx >= 4) || (dy >= 4))
+                        if ((dx >= 10) || (dy >= 10))
                         {
                                 // Drawing the Marquee
                                 if(this.options.selectedElement==="zoomInTool")