diff options
author | Ananya Sen | 2012-06-07 11:59:32 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-07 11:59:32 -0700 |
commit | 7378b6846f140106490f10c02cd7cec6a19023aa (patch) | |
tree | 90b60c007696b4a73c29abbae82562f69f15c11a /js/data/tools-data.js | |
parent | aea0e6879abfef02a827ed239ef091c3b96d6eb2 (diff) | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
download | ninja-7378b6846f140106490f10c02cd7cec6a19023aa.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/data/tools-data.js')
-rwxr-xr-x | js/data/tools-data.js | 4 |
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, |