diff options
| author | Jon Reid | 2012-06-20 15:05:26 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
| commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
| tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/components/toolbar.reel/toolbar-button.js | |
| parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/components/toolbar.reel/toolbar-button.js')
| -rw-r--r-- | js/components/toolbar.reel/toolbar-button.js | 2 |
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 | ||
| 7 | var Montage = require("montage").Montage, | 7 | var 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 | ||
| 11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { | 11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { |
| 12 | hasTemplate : { | 12 | hasTemplate : { |