aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 00:27:16 -0700
committerValerio Virgillito2012-03-20 00:27:16 -0700
commitefde3eab7a31070427142fa03f17985163a8d33b (patch)
tree04beb9394154c7f20b6e062170473ff180680848 /js/components/tools-properties
parentc28ba39e39e16e6c84f63c8564d1543f015ed0a9 (diff)
parent313354a8ff9ed21b826ab5f280bcf1095a64a7f4 (diff)
downloadninja-efde3eab7a31070427142fa03f17985163a8d33b.tar.gz
Merge branch 'refs/heads/button-switch' into montage-integration
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 13a88ba7..2d50a79e 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -69,7 +69,7 @@
69 69
70 }, 70 },
71 "fontSettings": { 71 "fontSettings": {
72 "module": "js/components/button.reel", 72 "module": "montage/ui/button.reel",
73 "name": "Button", 73 "name": "Button",
74 "properties": { 74 "properties": {
75 "element": {"#": "fontSettings"} 75 "element": {"#": "fontSettings"}