diff options
| author | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
| commit | e9c3c7d758fc59ad7b731730dd935170844d9538 (patch) | |
| tree | 2972d0384605eef4ba1a43636bd48db724f15713 /js/components/ui | |
| parent | cff7deb476f4095d7d3d76c92360617d3316a96f (diff) | |
| parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
| download | ninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz | |
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/components/ui')
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 58b1be9f..cd59c02c 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js | |||
| @@ -9,7 +9,7 @@ var Montage = require("montage/core/core").Montage, | |||
| 9 | HotText = require("js/components/hottext.reel").HotText, | 9 | HotText = require("js/components/hottext.reel").HotText, |
| 10 | HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit, | 10 | HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit, |
| 11 | Slider = require("js/components/slider.reel").Slider, | 11 | Slider = require("js/components/slider.reel").Slider, |
| 12 | Button = require("js/components/button.reel").Button, | 12 | Button = require("montage/ui/button.reel").Button, |
| 13 | Checkbox = require("js/components/checkbox.reel").Checkbox, | 13 | Checkbox = require("js/components/checkbox.reel").Checkbox, |
| 14 | Combobox = require("js/components/combobox.reel").Combobox, | 14 | Combobox = require("js/components/combobox.reel").Combobox, |
| 15 | TextField = require("js/components/TextField.reel").TextField, | 15 | TextField = require("js/components/TextField.reel").TextField, |