aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-19 13:53:40 -0700
committerValerio Virgillito2012-03-19 13:53:40 -0700
commit1b39a039291bcbabbcca9f778bc5a9bc990eafbb (patch)
tree400a419cfc32f84f52fea46a27eb2f91f001411f /js/components
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
parent50ee8428d398d2a5f21f4d642642ba85d7df3e5e (diff)
downloadninja-1b39a039291bcbabbcca9f778bc5a9bc990eafbb.tar.gz
Merge pull request #128 from mqg734/WebGLMaterials
Replacing old button component with montage button component in our UI.
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js2
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,