diff options
| author | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
| commit | 7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (patch) | |
| tree | af3b114d6a83ae62dfcead8bd61bc62efe0c9516 /js/components/tools-properties/text-properties.reel | |
| parent | d87cded11dcc0faf41a4a3e6b587e5549c0da6df (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-7bf738bc08f6a24edce30dbc2b101a8cab2d27aa.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 2 |
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"} |