diff options
| author | Jose Antonio Marquez | 2012-03-21 09:52:47 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-21 09:52:47 -0700 |
| commit | 37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8 (patch) | |
| tree | 3e8e0fa4e170763baad97f39fff3817893cec90a /js/panels/color | |
| parent | 44b66216531a872f8dba6a11f1cf13c612c90247 (diff) | |
| parent | 9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (diff) | |
| download | ninja-37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components
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; |