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/components/ui/property-control.reel/property-control.js | |
| parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.js')
| -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, |