diff options
| author | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
| commit | 846d539997bf188b9caf63cdf0008367fe6c9ede (patch) | |
| tree | ae0ed9293cd5859cd10694fb2e045b2101ed8df8 /js/panels/color | |
| parent | 595a569cf459e7e7cbe19e546c23322b56e44341 (diff) | |
| parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
| download | ninja-846d539997bf188b9caf63cdf0008367fe6c9ede.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/color')
| -rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.js | 1 | ||||
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js index 05bcb447..414be8b7 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.js +++ b/js/panels/color/colorchippopup.reel/colorchippopup.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; |
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; |