aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/panels/properties.reel/sections
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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",