aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:47:37 -0700
committerJose Antonio Marquez2012-06-20 16:47:37 -0700
commit313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (patch)
treec207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/components/toolbar.reel
parent2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-313a62245400e6c8cfa6d2f02c603cc7f01ddfc6.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/toolbar.reel')
-rw-r--r--js/components/toolbar.reel/toolbar-button.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
index 74129c2a..cfa86f76 100644
--- a/js/components/toolbar.reel/toolbar-button.js
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -6,7 +6,7 @@
6 6
7var Montage = require("montage").Montage, 7var Montage = require("montage").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 Button = require("montage/ui/button.reel/button").Button; 9 Button = require("montage/ui/native/button.reel/button").Button;
10 10
11var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { 11var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
12 hasTemplate : { 12 hasTemplate : {