Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 2 insertions, 2 deletions

diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index 2be74ada..8340ef50 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -16,14 +16,14 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
         value : function (event)
                 {
             var obj = this.application.ninja.stage.GetElement(event);
-            var cursor = "url('images/cursors/ink.png') 17 12, default";
+            var cursor = "url('images/cursors/ink.png') 6 11, default";
             var canColor = true;
             if (obj)
             {
                 var name = obj.nodeName;
                 if ((name !== 'CANVAS') && (name !== 'DIV'))
                 {
-                    cursor = "url('images/cursors/ink_no.png') 17 12, default";
+                    cursor = "url('images/cursors/ink_no.png') 6 11, default";
                     canColor = false;
                 }
             }