diff options
| author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
| commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
| tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/components/toolbar.reel | |
| parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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 : { |