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/tools-properties/fill-properties.reel/fill-properties.html | |
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/tools-properties/fill-properties.reel/fill-properties.html')
-rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index ca447b8b..cf68520f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "useFillColor": { | 14 | "useFillColor": { |
15 | "prototype": "montage/ui/checkbox.reel", | 15 | "prototype": "montage/ui/input-checkbox.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "useFillColor"}, | 17 | "element": {"#": "useFillColor"}, |
18 | "identifier": "useFillColor", | 18 | "identifier": "useFillColor", |
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "useWebGL": { | 23 | "useWebGL": { |
24 | "prototype": "montage/ui/checkbox.reel", | 24 | "prototype": "montage/ui/input-checkbox.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "useWebGL"}, | 26 | "element": {"#": "useWebGL"}, |
27 | "identifier": "useWebGL", | 27 | "identifier": "useWebGL", |