diff options
| author | Nivesh Rajbhandari | 2012-06-29 11:50:17 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-29 11:50:17 -0700 |
| commit | 81d75ac08ff24dc3078d79a9133e54f592c23026 (patch) | |
| tree | 4f4136503c87a72f7af67a54dad69c14469ee01e /js/panels/properties.reel/sections/custom.reel | |
| parent | 01783536d2245b474eb1f89df673bfabb006cbdd (diff) | |
| parent | ecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff) | |
| download | ninja-81d75ac08ff24dc3078d79a9133e54f592c23026.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ColorGradientFix
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 5112fca9..ed4616da 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
| @@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
| 20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
| 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
| 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
| 23 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/native/button.reel").Button; |
| 24 | 24 | ||
| 25 | exports.CustomSection = Montage.create(Component, { | 25 | exports.CustomSection = Montage.create(Component, { |
| 26 | 26 | ||