diff options
| author | Ananya Sen | 2012-06-20 15:20:04 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-20 15:20:04 -0700 |
| commit | caa9683fd259307658f96190a5c5bd771126fbb8 (patch) | |
| tree | 83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/components/toolbar.reel | |
| parent | d852ea28dad399e84e8d5e69c0293500c30b59f1 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/toolbar.reel')
| -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 : { |