diff options
| author | Eric Guzman | 2012-04-02 15:36:08 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-02 15:36:08 -0700 |
| commit | 0241bf331b7e06e206a54be441edf2f4c7261f63 (patch) | |
| tree | b7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/panels/color/colorpanelpopup.reel | |
| parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js index b957d495..dd7e6192 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | |||
| @@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
| 10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
| 11 | Slider = require("js/components/slider.reel").Slider, | 11 | Slider = require("js/components/slider.reel").Slider, |
| 12 | Button = require("js/components/button.reel").Button, | ||
| 13 | HotText = require("js/components/hottext.reel").HotText, | 12 | HotText = require("js/components/hottext.reel").HotText, |
| 14 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, | 13 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, |
| 15 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; | 14 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; |