diff options
author | Jon Reid | 2012-06-12 13:32:02 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/data/tools-data.js | |
parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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, |