aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJon Reid2012-02-24 13:04:35 -0800
committerJon Reid2012-02-24 13:04:35 -0800
commitae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch)
tree5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/data
parentc615e1d305424f16f64aca16cf38da760a5eec87 (diff)
parent8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
downloadninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into Timeline-local
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/tools-data.js22
1 files changed, 11 insertions, 11 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 00de9236..cf48757d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -153,21 +153,21 @@ exports.ToolsData = Montage.create(Montage, {
153 "action": "FillTool", 153 "action": "FillTool",
154 "toolTip": "Fill Tool", 154 "toolTip": "Fill Tool",
155 "cursor": "url('images/tools/bucket_down.png'), default", 155 "cursor": "url('images/tools/bucket_down.png'), default",
156 "lastInGroup": false,
157 "container": false,
158 "selected": false
159 },
160 {
161 "id": "InkBottleTool",
162 "properties": "inkbottleProperties",
163 "spriteSheet": true,
164 "action": "InkBottleTool",
165 "toolTip": "Ink Bottle Tool",
166 "cursor": "url('images/tools/inkbottle_down.png'), default",
156 "lastInGroup": true, 167 "lastInGroup": true,
157 "container": false, 168 "container": false,
158 "selected": false 169 "selected": false
159 }, 170 },
160// {
161// "id": "InkBottleTool",
162// "properties": "inkbottleProperties",
163// "spriteSheet": true,
164// "action": "InkBottleTool",
165// "toolTip": "Ink Bottle Tool",
166// "cursor": "url('images/tools/inkbottle_down.png'), default",
167// "lastInGroup": false,
168// "container": false,
169// "selected": false
170// },
171 { 171 {
172 "id": "EyedropperTool", 172 "id": "EyedropperTool",
173 "properties": "eyedropperProperties", 173 "properties": "eyedropperProperties",