diff options
| author | Pushkar Joshi | 2012-05-22 13:24:23 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:24:23 -0700 |
| commit | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (patch) | |
| tree | 629352d8c01214a0fa1a08be1f4a4961aa64aa32 /js/data | |
| parent | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (diff) | |
| parent | f4df8204a57e1bc6021b651ebb2259f9931cf26f (diff) | |
| download | ninja-eea0a556e44c2b60d3aaf6e46d2432d3e6303812.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/data')
| -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 32eaf24d..179e8e81 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
| @@ -100,7 +100,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 100 | "properties": "penProperties", | 100 | "properties": "penProperties", |
| 101 | "spriteSheet": true, | 101 | "spriteSheet": true, |
| 102 | "action": "PenTool", | 102 | "action": "PenTool", |
| 103 | "toolTip": "Pen Tool", | 103 | "toolTip": "Pen Tool (P)", |
| 104 | "cursor": "auto", | 104 | "cursor": "auto", |
| 105 | "lastInGroup": false, | 105 | "lastInGroup": false, |
| 106 | "container": false, | 106 | "container": false, |
| @@ -159,7 +159,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 159 | "properties": "brushProperties", | 159 | "properties": "brushProperties", |
| 160 | "spriteSheet": true, | 160 | "spriteSheet": true, |
| 161 | "action": "BrushTool", | 161 | "action": "BrushTool", |
| 162 | "toolTip": "Brush Tool", | 162 | "toolTip": "Brush Tool (B)", |
| 163 | "cursor": "url('images/tools/brush_down.png') 9 17, default", | 163 | "cursor": "url('images/tools/brush_down.png') 9 17, default", |
| 164 | "lastInGroup": false, | 164 | "lastInGroup": false, |
| 165 | "container": false, | 165 | "container": false, |