diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/panels/css-panel/css-style.reel | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/css-panel/css-style.reel')
| -rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.html | 2 |
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 |