aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/css-style.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-20 15:20:04 -0700
committerAnanya Sen2012-06-20 15:20:04 -0700
commitcaa9683fd259307658f96190a5c5bd771126fbb8 (patch)
tree83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/panels/css-panel/css-style.reel
parentd852ea28dad399e84e8d5e69c0293500c30b59f1 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/css-panel/css-style.reel')
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html
index 0f16b3d8..4e670cdc 100644
--- a/js/panels/css-panel/css-style.reel/css-style.html
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -24,7 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
24 "object": "js/panels/CSSPanel/css-property-name-list" 24 "object": "js/panels/CSSPanel/css-property-name-list"
25 }, 25 },
26 "checkbox": { 26 "checkbox": {
27 "prototype": "montage/ui/checkbox.reel", 27 "prototype": "montage/ui/native/input-checkbox.reel",
28 "properties": { 28 "properties": {
29 "element": {"#": "disable-checkbox"}, 29 "element": {"#": "disable-checkbox"},
30 "checked": true 30 "checked": true