aboutsummaryrefslogtreecommitdiff
path: root/js/data/tools-data.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-06 14:37:04 -0700
committerValerio Virgillito2012-06-06 14:37:04 -0700
commitbc7ca741f8c8adcb5c5919af6f808a20c37ea5d7 (patch)
tree0e4cf90f47937e7d718d82da1a0d0dab5ac5f136 /js/data/tools-data.js
parentfb684fb27c2cef04251655d86e55eceed9da3132 (diff)
parente14ce28b5c8858af75fbf2003c8f1b854daa7e35 (diff)
downloadninja-bc7ca741f8c8adcb5c5919af6f808a20c37ea5d7.tar.gz
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/data/tools-data.js')
-rwxr-xr-xjs/data/tools-data.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 05455efe..138f9f4d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -104,7 +104,7 @@ exports.ToolsData = Montage.create(Montage, {
104 "properties": "penProperties", 104 "properties": "penProperties",
105 "spriteSheet": true, 105 "spriteSheet": true,
106 "action": "PenTool", 106 "action": "PenTool",
107 "toolTip": "Pen Tool", 107 "toolTip": "Pen Tool (P)",
108 "cursor": "auto", 108 "cursor": "auto",
109 "lastInGroup": false, 109 "lastInGroup": false,
110 "container": false, 110 "container": false,
@@ -165,7 +165,7 @@ exports.ToolsData = Montage.create(Montage, {
165 "properties": "brushProperties", 165 "properties": "brushProperties",
166 "spriteSheet": true, 166 "spriteSheet": true,
167 "action": "BrushTool", 167 "action": "BrushTool",
168 "toolTip": "Brush Tool", 168 "toolTip": "Brush Tool (B)",
169 "cursor": "url('images/tools/brush_down.png') 9 17, default", 169 "cursor": "url('images/tools/brush_down.png') 9 17, default",
170 "lastInGroup": false, 170 "lastInGroup": false,
171 "container": false, 171 "container": false,