diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/components/toolbar.reel/toolbar-button.js | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 : { |