diff options
author | Jose Antonio Marquez | 2012-03-21 09:51:50 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-21 09:51:50 -0700 |
commit | b1ba63e509f77b14c05b89ea193f4d706a28ac9b (patch) | |
tree | b6c35ce69c667f3ee8c16cc5e9a86021a4646288 /js/panels/color/colorchippopup.reel/colorchippopup.js | |
parent | 415bab69cca4e8511144407b67bec80f2ba95422 (diff) | |
parent | 9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (diff) | |
download | ninja-b1ba63e509f77b14c05b89ea193f4d706a28ac9b.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/color/colorchippopup.reel/colorchippopup.js')
-rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.js | 1 |
1 files changed, 0 insertions, 1 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; |