diff options
| author | Ananya Sen | 2012-06-20 15:20:04 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-20 15:20:04 -0700 |
| commit | caa9683fd259307658f96190a5c5bd771126fbb8 (patch) | |
| tree | 83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |
| parent | d852ea28dad399e84e8d5e69c0293500c30b59f1 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 2 |
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", |