aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel/tool-button.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /js/components/layout/tool-button.reel/tool-button.js
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.js')
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 509512d0..72f46830 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -42,7 +42,7 @@ exports.ToolButton = Montage.create(Component, {
42 }, 42 },
43 43
44 _currentSubSelected: { value: 0}, 44 _currentSubSelected: { value: 0},
45 45
46 prepareForDraw: { 46 prepareForDraw: {
47 enumerable: false, 47 enumerable: false,
48 value: function() { 48 value: function() {