aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:04:25 -0700
committerArmen Kesablyan2012-06-20 15:04:25 -0700
commitfc818d31de267d2b77fda3b3029ad38d48698be8 (patch)
tree122ebf54d3378578c1ded4d786ba3940d4a911d2 /js/panels/properties.reel/sections
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-fc818d31de267d2b77fda3b3029ad38d48698be8.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 572e5a60..259e9ab5 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -232,7 +232,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
232 } 232 }
233 }, 233 },
234 "flattenCheckbox": { 234 "flattenCheckbox": {
235 "prototype": "montage/ui/checkbox.reel", 235 "prototype": "montage/ui/input-checkbox.reel",
236 "properties": { 236 "properties": {
237 "element": {"#": "flattenCh"}, 237 "element": {"#": "flattenCh"},
238 "identifier": "flatten", 238 "identifier": "flatten",