diff options
| author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
| commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
| tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/components/toolbar.reel/toolbar-button.js | |
| parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
| parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
| download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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 : { |