aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/components/tools-properties/fill-properties.reel
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html4
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",