diff options
| author | hwc487 | 2012-03-24 14:07:58 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-24 14:07:58 -0700 |
| commit | cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch) | |
| tree | 4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /js/components/tools-properties/text-properties.reel/text-properties.html | |
| parent | 62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff) | |
| parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
| download | ninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz | |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
| -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"} |