diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/components/ui | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/ui')
| -rwxr-xr-x | js/components/ui/label-checkbox.reel/label-checkbox.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html index 0efc7ae0..d39fca9b 100755 --- a/js/components/ui/label-checkbox.reel/label-checkbox.html +++ b/js/components/ui/label-checkbox.reel/label-checkbox.html | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | }, | 20 | }, |
| 21 | 21 | ||
| 22 | "checkbox": { | 22 | "checkbox": { |
| 23 | "prototype": "montage/ui/checkbox.reel", | 23 | "prototype": "montage/ui/input-checkbox.reel", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "checkbox"}, | 25 | "element": {"#": "checkbox"}, |
| 26 | "checked": false | 26 | "checked": false |