diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/data | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/data')
| -rwxr-xr-x | js/data/tools-data.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index cf48757d..faf3336f 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
| @@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 37 | "properties": "rotate3DProperties", | 37 | "properties": "rotate3DProperties", |
| 38 | "spriteSheet": true, | 38 | "spriteSheet": true, |
| 39 | "action": "Rotate3DTool", | 39 | "action": "Rotate3DTool", |
| 40 | "toolTip": "3D Rotate Object Tool (W)", | 40 | "toolTip": "3D Object Rotate Tool (W)", |
| 41 | "cursor": "auto", | 41 | "cursor": "auto", |
| 42 | "lastInGroup": false, | 42 | "lastInGroup": false, |
| 43 | "container": false, | 43 | "container": false, |
| @@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 48 | "properties": "translate3DProperties", | 48 | "properties": "translate3DProperties", |
| 49 | "spriteSheet": true, | 49 | "spriteSheet": true, |
| 50 | "action": "Translate3DTool", | 50 | "action": "Translate3DTool", |
| 51 | "toolTip": "3D Translate Object Tool (G)", | 51 | "toolTip": "3D Object Translate Tool (G)", |
| 52 | "cursor": "auto", | 52 | "cursor": "auto", |
| 53 | "lastInGroup": true, | 53 | "lastInGroup": true, |
| 54 | "container": false, | 54 | "container": false, |
| @@ -141,7 +141,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 141 | "spriteSheet": true, | 141 | "spriteSheet": true, |
| 142 | "action": "BrushTool", | 142 | "action": "BrushTool", |
| 143 | "toolTip": "Brush Tool", | 143 | "toolTip": "Brush Tool", |
| 144 | "cursor": "url('images/tools/brush_down.png'), default", | 144 | "cursor": "url('images/tools/brush_down.png') 9 17, default", |
| 145 | "lastInGroup": false, | 145 | "lastInGroup": false, |
| 146 | "container": false, | 146 | "container": false, |
| 147 | "selected": false | 147 | "selected": false |
| @@ -195,7 +195,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 195 | "properties": "rotateStageProperties", | 195 | "properties": "rotateStageProperties", |
| 196 | "spriteSheet": true, | 196 | "spriteSheet": true, |
| 197 | "action": "RotateStageTool3D", | 197 | "action": "RotateStageTool3D", |
| 198 | "toolTip": "3D Rotate Stage Tool", | 198 | "toolTip": "3D Stage Rotate Tool (M)", |
| 199 | "cursor": "auto", | 199 | "cursor": "auto", |
| 200 | "lastInGroup": false, | 200 | "lastInGroup": false, |
| 201 | "container": false, | 201 | "container": false, |