Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 0 insertions, 32 deletions

diff --git a/js/tools/PencilTool.js b/js/tools/PencilTool.js
deleted file mode 100755
index 349eb1e8..00000000
--- a/js/tools/PencilTool.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage,
-    DrawingTool = require("js/tools/drawing-tool").DrawingTool;
-
-exports.PencilTool = Montage.create(DrawingTool, {
-    drawingFeedback: { value: { mode: "Draw2D", type: "" } },
-
-    HandleLeftButtonDown: {
-        value: function(event) {
-            NJevent("enableStageMove");
-
-        }
-    },
-
-    HandleMouseMove: {
-        value: function(event) {
-            this.doDraw(event);
-        }
-    },
-
-    HandleLeftButtonUp: {
-        value: function(event) {
-            this.endDraw(event);
-            NJevent("disableStageMove");
-        }
-    }
-});
\ No newline at end of file