diff options
| author | Jose Antonio Marquez | 2012-03-21 13:26:55 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-21 13:26:55 -0700 |
| commit | 25c93afe8795c1b53859f4fa08220a947ace937e (patch) | |
| tree | bf7ba60aa1e31cf479ec4a53f9f3e510cfd9a4dd /js/components/tools-properties | |
| parent | df25e7bb3dd45cec5815dcd303a94726e982cabf (diff) | |
| parent | babe504e1cdfd98a5df8fd325d54aab72ca3cdb0 (diff) | |
| download | ninja-25c93afe8795c1b53859f4fa08220a947ace937e.tar.gz | |
Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components
Diffstat (limited to 'js/components/tools-properties')
| -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"} |